Commit Graph

782 Commits

Author SHA1 Message Date
40cfd5112f Merge pull request #178 from stanzhai/develop
【校对】解决一些冲突,修复一处代码错误
2014-06-14 23:09:26 +08:00
f37d492c30 correct 2.21 code mistakes 2014-06-14 22:38:08 +08:00
75354617e7 correct 2.21 code mistakes 2014-06-14 22:33:34 +08:00
e1e1c5abbc merge 2.21,3.5 confilicts 2014-06-14 22:30:44 +08:00
460bd5968b merge 2.21,2.23,3.5 confilicts 2014-06-14 22:27:05 +08:00
d7fb7d0b9c Merge pull request #176 from stanzhai/develop
【校对】人工逐节校对中,完善文档格式,代码风格,明显错误检查
2014-06-14 22:12:38 +08:00
1f534a713d merge conflict 2014-06-14 22:09:42 +08:00
7c5cd7067c fix 3.5 declarations 2014-06-14 22:08:24 +08:00
e263b4547c fix 3.4 expressions 2014-06-14 22:08:24 +08:00
21adbd3538 fix 3.3 types(2) 2014-06-14 22:06:58 +08:00
9f284da361 fix 3.3 types 2014-06-14 22:06:58 +08:00
8404de09e9 fix 3.2 lexical structure 2014-06-14 22:06:58 +08:00
77ab99ffa5 fix 3.1 about the language reference 2014-06-14 22:06:58 +08:00
017f33b666 fix 2.23 advaced operators 2014-06-14 22:06:58 +08:00
9a18a3176e fix 2.22 generices 2014-06-14 22:02:14 +08:00
7e1ae9a637 merge 2.21 protocols 2014-06-14 22:00:18 +08:00
07815a8288 fix 2.20 extensions 2014-06-14 21:55:16 +08:00
76fee23329 fix 2.19 Nested 2014-06-14 21:55:15 +08:00
73ab76f855 fix 2.18 type casting 2014-06-14 21:55:15 +08:00
13c92c1432 fix 2.17 optional chainning 2014-06-14 21:55:15 +08:00
f8a39d0e20 fix 2.16 automatic reference counting 2014-06-14 21:55:15 +08:00
698efafc26 fix 3.5 declarations 2014-06-14 21:42:52 +08:00
a7c0f6f3d6 fix 3.4 expressions 2014-06-14 20:59:23 +08:00
31f083eb83 make gitbook 2014-06-14 20:51:32 +08:00
e00caf63d5 Merge branch 'wxstars-develop' into gh-pages 2014-06-14 20:42:24 +08:00
431269279b resolve conflict 2014-06-14 20:41:51 +08:00
1045cccfce fix 3.3 types(2) 2014-06-14 20:29:50 +08:00
997f1ad82f fix 3.3 types 2014-06-14 20:25:19 +08:00
0d9480fc95 fix 3.2 lexical structure 2014-06-14 20:13:44 +08:00
9f58dfc4e6 fix 3.1 about the language reference 2014-06-14 19:58:40 +08:00
395e6b34c3 fix 2.23 advaced operators 2014-06-14 19:56:30 +08:00
5f20e3f4af fix 2.22 generices 2014-06-14 19:51:22 +08:00
3ce6c6dd84 fix 2.21 protocols 2014-06-14 19:46:02 +08:00
f82f207871 fix 2.20 extensions 2014-06-14 19:40:05 +08:00
c55862e5e0 fix 2.19 Nested 2014-06-14 19:37:12 +08:00
fcb99de0be fix 2.18 type casting 2014-06-14 19:26:45 +08:00
666da96748 fix 2.17 optional chainning 2014-06-14 19:10:30 +08:00
12ba3ad90c fix 2.16 automatic reference counting 2014-06-14 19:05:10 +08:00
3a2d363fa4 Merge pull request #171 from stanzhai/develop
【校对】人工逐节校对中,完善代码风格,语法说明等
2014-06-14 18:24:13 +08:00
8345ea8a2d Merge pull request #174 from yulingtianxia/develop
update extensions
2014-06-14 18:21:03 +08:00
affa64a08b fix 2.15 Deinitialization 2014-06-14 18:05:49 +08:00
c27fad956a fix 2.13 inheritance(2) 2014-06-14 17:59:04 +08:00
b0d128de21 fix 2.14 initialization 2014-06-14 17:58:37 +08:00
e13d4f3cb7 fix 2.13 inheritance 2014-06-14 17:55:09 +08:00
4de16a1d89 fix 2.12 subscripts 2014-06-14 17:51:36 +08:00
3aeba381d7 fix 2.11 methods 2014-06-14 17:48:50 +08:00
bf1a2fa17c Merge branch 'develop' of https://github.com/stanzhai/the-swift-programming-language-in-chinese into develop 2014-06-14 17:42:18 +08:00
bd7ae8ef6e fix 2.10 properties 2014-06-14 17:41:25 +08:00
62edf92aea fix 2.9 classes and structures 2014-06-14 17:39:24 +08:00
514252d305 fix 2.9 classes and structures 2014-06-14 17:33:10 +08:00