|
|
460bd5968b
|
merge 2.21,2.23,3.5 confilicts
|
2014-06-14 22:27:05 +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 |
|
|
|
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 |
|
|
|
31f083eb83
|
make gitbook
|
2014-06-14 20:51:32 +08:00 |
|
|
|
431269279b
|
resolve conflict
|
2014-06-14 20:41:51 +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 |
|
|
|
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 |
|
|
|
bd7ae8ef6e
|
fix 2.10 properties
|
2014-06-14 17:41:25 +08:00 |
|
|
|
514252d305
|
fix 2.9 classes and structures
|
2014-06-14 17:33:10 +08:00 |
|
|
|
23ccecdeb0
|
fix 2.8 Enumerations
|
2014-06-14 17:28:44 +08:00 |
|
|
|
a516af6a53
|
fix 他
|
2014-06-14 17:25:03 +08:00 |
|
|
|
6b9026dd9b
|
fix 2.7 closures(2)
|
2014-06-14 17:23:00 +08:00 |
|
|
|
fee9162d6c
|
fix 2.7 closures
|
2014-06-14 17:19:58 +08:00 |
|
|
|
4857641a41
|
fix 2..6 Functions
|
2014-06-14 17:07:30 +08:00 |
|
|
|
c5ef9d6a84
|
update extensions
按照之前构造器那章的翻译应该翻译成逐一成员构造器
|
2014-06-14 17:03:55 +08:00 |
|
|
|
3a76773cde
|
update extensions
少翻译了一段，已补上
|
2014-06-14 16:53:51 +08:00 |
|
|
|
5c6cd039bf
|
fix 2.5 Control_Flow(2)
|
2014-06-14 16:53:26 +08:00 |
|
|
|
a31e7908f7
|
fix 2.5 Control_Flow
|
2014-06-14 16:50:46 +08:00 |
|
|
|
1c10a65bd3
|
统一标准
|
2014-06-14 16:43:18 +08:00 |
|
|
|
57b4b6475a
|
fix 2.4 Collection_Types
|
2014-06-14 16:34:13 +08:00 |
|
|
|
a168d94822
|
fix 2.3 Strings_and_Characters
|
2014-06-14 16:27:01 +08:00 |
|
|
|
19112e1cd2
|
fix 2.2 basic operators
|
2014-06-14 16:18:40 +08:00 |
|
|
|
24bc899b1d
|
fix 2.1 the basics
|
2014-06-14 16:11:17 +08:00 |
|
|
|
7011436cef
|
modify right back
|
2014-06-14 15:57:52 +08:00 |
|
|
|
9547fd69fe
|
modify
|
2014-06-14 15:49:19 +08:00 |
|
|
|
b3ef454499
|
correct the wrong "half-closed loop"
|
2014-06-14 00:41:55 +08:00 |
|
|
|
75ad5ed45d
|
Merge branch 'gh-pages' of https://github.com/numbbbbb/the-swift-programming-language-in-chinese into gh-pages
|
2014-06-14 00:18:44 +08:00 |
|
|
|
6b431dfdd7
|
fix conflict
|
2014-06-14 00:17:41 +08:00 |
|
