yulingtianxia 53a6a87ab6 fix conflict

2014-06-15 20:01:01 +08:00

..

01_The_Basics.md

fix 2.1 the basics[ref style]

2014-06-15 14:23:56 +08:00

02_Basic_Operators.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

03_Strings_and_Characters.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

04_Collection_Types.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

05_Control_Flow.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

06_Functions.md

Corrected spelling.

2014-06-15 17:14:37 +08:00

07_Closures.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

08_Enumerations.md

Fixed link.

2014-06-15 18:40:07 +08:00

09_Classes_and_Structures.md

Merge pull request #195 from twlkyao/patch-1

2014-06-15 18:54:57 +08:00

10_Properties.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

11_Methods.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

12_Subscripts.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

13_Inheritance.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

14_Initialization.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

15_Deinitialization.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

16_Automatic_Reference_Counting.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

17_Optional_Chaining.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

18_Type_Casting.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

19_Nested_Types.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

20_Extensions.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

21_Protocols.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

22_Generics.md

fix conflict

2014-06-15 20:01:01 +08:00

23_Advanced_Operators.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00

chapter2.md

correct a mistake, fix header ref

2014-06-15 12:35:22 +08:00