梁杰 d53ecf0d75 Merge pull request #185 from stanzhai/develop ...

【校对】审查完所有文档，确保没有冲突

2014-06-15 10:08:15 +08:00

..

01_The_Basics.md

resolve conflict

2014-06-14 20:41:51 +08:00

02_Basic_Operators.md

resolve conflict

2014-06-14 20:41:51 +08:00

03_Strings_and_Characters.md

resolve conflict

2014-06-14 20:41:51 +08:00

04_Collection_Types.md

fix 2.4 collection types

2014-06-15 09:28:28 +08:00

05_Control_Flow.md

resolve conflict

2014-06-14 20:41:51 +08:00

06_Functions.md

Corrected spelling.

2014-06-14 22:58:10 +08:00

07_Closures.md

resolve conflict

2014-06-14 20:41:51 +08:00

08_Enumerations.md

Update 08_Enumerations.md

2014-06-14 20:38:31 -05:00

09_Classes_and_Structures.md

fix 2.9 classes and structures

2014-06-15 09:51:37 +08:00

10_Properties.md

resolve conflict

2014-06-14 20:41:51 +08:00

11_Methods.md

resolve conflict

2014-06-14 20:41:51 +08:00

12_Subscripts.md

resolve 2.12 conflict

2014-06-15 09:56:40 +08:00

13_Inheritance.md

resolve conflict

2014-06-14 20:41:51 +08:00

14_Initialization.md

resolve conflict

2014-06-14 20:41:51 +08:00

15_Deinitialization.md

resolve all conflict

2014-06-15 10:01:25 +08:00

16_Automatic_Reference_Counting.md

fix 2.16 automatic reference counting

2014-06-14 21:55:15 +08:00

17_Optional_Chaining.md

fix 2.17 optional chainning

2014-06-14 21:55:15 +08:00

18_Type_Casting.md

fix 3.5 declarations

2014-06-14 22:08:24 +08:00

19_Nested_Types.md

fix 2.20 extensions

2014-06-14 21:55:16 +08:00

20_Extensions.md

fix 2.20 extensions

2014-06-14 21:55:16 +08:00

21_Protocols.md

make gitbook

2014-06-14 23:24:20 +08:00

22_Generics.md

fix 2.22 generices

2014-06-14 22:02:14 +08:00

23_Advanced_Operators.md

merge 2.21,2.23,3.5 confilicts

2014-06-14 22:27:05 +08:00

chapter2.md

统一标准

2014-06-14 16:43:18 +08:00