Commit Graph

2029 Commits

Author SHA1 Message Date
stanzhai
d616b61093 fix 1.2 a swift tour [ref style] 2014-06-15 17:20:52 +08:00
Shiyao Qi
814bc1b80c Corrected spelling.
Corrected "标示" to "标识".
2014-06-15 17:14:37 +08:00
梁杰
cfe0009c27 Merge pull request #192 from wesleysui/gh-pages
remove duplication
2014-06-15 16:20:17 +08:00
梁杰
d2515414e5 Merge pull request #191 from stanzhai/develop
【Fix】 2.1 the basics[ref style]引用风格,保持前后一致
2014-06-15 16:20:09 +08:00
梁杰
aaebfdc646 Merge pull request #190 from umcsdon/patch-1
Fixed: Typo in Chap#2.9
2014-06-15 16:19:59 +08:00
Sui Jingyun
644eeb127c Update 10_Properties.html
remove duplications
2014-06-15 16:03:55 +08:00
Sui Jingyun
fe8b62bbc6 remove duplication 2014-06-15 15:57:26 +08:00
stanzhai
99bbc86d72 fix 3.2 lexical strute 【将li中过长文本进行换行】 2014-06-15 14:40:32 +08:00
stanzhai
a52edf9634 fix 2.1 the basics[ref style] 2014-06-15 14:23:56 +08:00
Junjie Huang
7a5d669584 Fixed: Typo in Chap#2.9 2014-06-15 01:19:06 -05:00
numbbbbb
7f682ad729 make gitbook 2014-06-15 13:23:33 +08:00
梁杰
df5bde0967 Merge pull request #189 from stanzhai/develop
【Fix】@wh1100717兄添加作者链接时把后面的2各空格给弄没了,添加之
2014-06-15 13:20:09 +08:00
numbbbbb
9791e816fe make gitbook 2014-06-15 13:04:11 +08:00
stanzhai
3e32451fc9 resolve conflicts 2014-06-15 12:37:08 +08:00
stanzhai
78604738b6 correct a mistake, fix header ref 2014-06-15 12:35:22 +08:00
stanzhai
f80d660e06 correct a mistake, fix header ref 2014-06-15 12:24:57 +08:00
梁杰
fca29b22b1 Merge pull request #188 from umcsdon/patch-1
Update 08_Enumerations.md
2014-06-15 12:17:49 +08:00
Junjie Huang
7683e9151a Update 08_Enumerations.md 2014-06-14 23:16:02 -05:00
Wang Hao
c8274cfd02 Update README 2014-06-15 12:05:15 +08:00
Wang Hao
04e905a4db Update README 2014-06-15 12:03:45 +08:00
Wang Hao
9dbfde8dc0 Fixed contributor name error 2014-06-15 11:53:10 +08:00
梁杰
3d0878f2a2 Merge pull request #187 from umcsdon/patch-2
Update 08_Enumerations.md
2014-06-15 11:49:47 +08:00
Junjie Huang
0ebe8860c9 Update 08_Enumerations.md 2014-06-14 22:46:38 -05:00
Wang Hao
335e6f9784 Add: 译者和校对人github地址 2014-06-15 11:32:26 +08:00
梁杰
d53ecf0d75 Merge pull request #185 from stanzhai/develop
【校对】审查完所有文档,确保没有冲突
2014-06-15 10:08:15 +08:00
stanzhai
c3a2c7bc48 resolve all conflict 2014-06-15 10:01:25 +08:00
stanzhai
69bcca347a resolve 2.12 conflict 2014-06-15 09:56:40 +08:00
stanzhai
9a3df30ff8 fix 2.9 classes and structures 2014-06-15 09:51:37 +08:00
梁杰
2df0317e3e Merge pull request #184 from stanzhai/develop
【校对】删除.DS_Store,添加.gitignore,解决2.4节冲突,标准化3.9文档
2014-06-15 09:44:43 +08:00
梁杰
96bfca6cf6 Merge pull request #183 from umcsdon/patch-2
Update 08_Enumerations.md
2014-06-15 09:39:02 +08:00
Junjie Huang
58ea0368da Update 08_Enumerations.md 2014-06-14 20:38:31 -05:00
stanzhai
fc6a6c501a fix 3.9,resolve 2.4 conflict 2014-06-15 09:36:10 +08:00
stanzhai
773f9909cd fix 2.4 collection types 2014-06-15 09:28:28 +08:00
numbbbbb
4dc52f3174 make gitbook 2014-06-15 08:30:20 +08:00
SiweiShen
40d1275bee Merge pull request #181 from stanzhai/develop
【校对】完成首轮人工校对
2014-06-15 06:30:04 +08:00
stanzhai
36cff3224c Merge branch 'develop' of https://github.com/stanzhai/the-swift-programming-language-in-chinese into develop 2014-06-15 00:50:53 +08:00
stanzhai
81b31affd4 fix 3.10 statements 2014-06-15 00:17:29 +08:00
stanzhai
2500a7f130 fix 3.8 generic parameters and arguments 2014-06-15 00:01:26 +08:00
stanzhai
29aed911e2 fix 3.7 patterns 2014-06-14 23:49:34 +08:00
stanzhai
2294c9020f fix 3.6 attributes 2014-06-14 23:31:09 +08:00
numbbbbb
4634005f9c make gitbook 2014-06-14 23:24:20 +08:00
梁杰
a0489eef96 Merge pull request #179 from twlkyao/patch-1
Corrected spelling.
2014-06-14 23:09:42 +08:00
梁杰
40cfd5112f Merge pull request #178 from stanzhai/develop
【校对】解决一些冲突,修复一处代码错误
2014-06-14 23:09:26 +08:00
stanzhai
a14f3e43bd correct 2.21 code mistakes 2014-06-14 23:06:20 +08:00
stanzhai
974e8c59b0 correct 2.21 code mistakes 2014-06-14 23:06:20 +08:00
stanzhai
df9d6bd803 merge 2.21,3.5 confilicts 2014-06-14 23:06:20 +08:00
stanzhai
2953510924 merge 2.21,2.23,3.5 confilicts 2014-06-14 23:06:19 +08:00
Shiyao Qi
bea59d951a Corrected spelling.
Corrected spelling.
2014-06-14 22:58:10 +08:00
stanzhai
f37d492c30 correct 2.21 code mistakes 2014-06-14 22:38:08 +08:00
stanzhai
75354617e7 correct 2.21 code mistakes 2014-06-14 22:33:34 +08:00