Commit Graph

442 Commits

Author SHA1 Message Date
717f7e653e resolve conflict 2014-06-10 12:47:46 +08:00
71da888498 统一符号使用 2014-06-10 12:46:55 +08:00
a385e6b2ad resolve conflict 2014-06-10 12:45:13 +08:00
b90c932be7 修改一些表达方式。 2014-06-10 12:44:15 +08:00
d1a3c1a2b7 Merge pull request #78 from vclwei/develop
翻译控制流一章(未完)
2014-06-10 12:25:39 +08:00
5898015dbe 修改For Loops 和 While Loops 译文标题格式 2014-06-10 12:18:21 +08:00
d8fbf32deb 完成控制流一章中For Loops, While Loops 翻译 2014-06-10 12:16:55 +08:00
9eddc9af5a update 02/21 and 03/10 2014-06-10 12:14:55 +08:00
7d716b5daf Update README.md 2014-06-10 12:10:17 +08:00
7d9c7b7bff Merge pull request #67 from stanzhai/develop
[ 语法总结 ] 翻译完毕!
2014-06-10 12:09:51 +08:00
16d841ed40 Merge pull request #81 from geek5nan/develop
内容勘误完成
2014-06-10 12:07:46 +08:00
3179f6bd44 Merge branch 'gh-pages' of https://github.com/numbbbbb/the-swift-programming-language-in-chinese into develop 2014-06-10 11:50:20 +08:00
dfb6112e8c 内容勘误 2014-06-10 11:44:13 +08:00
6726c28cca complete !(Summary of the Grammar) 2014-06-10 11:27:43 +08:00
81715fb9df Merge pull request #80 from bzsy/patch-2
Update 02_Basic_Operators.md
2014-06-10 10:22:54 +08:00
e91a2de6b3 Update 02_Basic_Operators.md
编辑错误,202行,“o或”修改为“或”
2014-06-10 10:16:27 +08:00
c0daec5f4f Update README.md 2014-06-10 08:09:15 +08:00
d13b09a8c8 fix some terms 2014-06-10 00:54:05 +08:00
a90eac43cf update 03/09 2014-06-09 23:42:49 +08:00
19c52d124b correct an mistake 2014-06-09 23:40:59 +08:00
6ccb4be376 Merge pull request #64 from fd5788/gh-pages
[ 泛型参数 ]add Generic Parameters and Arguments
2014-06-09 23:02:27 +08:00
6bb167c668 fix conflicts 2014-06-09 22:51:06 +08:00
0c5082077e 泛型参数翻译完毕 2014-06-09 22:40:19 +08:00
93a4928a5c add Generic Parameters and Arguments 2014-06-09 22:40:19 +08:00
b318990799 翻译控制流一章(未完) 2014-06-09 22:34:01 +08:00
bfaa2367d8 correct the error translate in enum 2014-06-09 22:19:55 +08:00
1985548298 correct an mistake 2014-06-09 22:06:47 +08:00
5b2a5af734 correct an mistake 2014-06-09 22:03:51 +08:00
a2cfd75ea0 update 03/03 2014-06-09 21:41:32 +08:00
a00d973e61 update 03/02 2014-06-09 21:37:53 +08:00
853ba2fcfe Update README.md 2014-06-09 21:31:59 +08:00
f368db55e1 Merge pull request #66 from lyuka/develop
【Types】认领第三章类型
2014-06-09 21:31:27 +08:00
ec4c909496 ch3 03_Types done 2014-06-09 21:26:05 +08:00
40baeefeaa ch3 03_Types done. 2014-06-09 21:18:11 +08:00
7b2bb64212 ch3 03_type begin... 2014-06-09 21:18:11 +08:00
1e3c303f99 add more translate 2014-06-09 20:29:40 +08:00
02a75f984d make consistent with the previous chapter 2014-06-09 19:43:37 +08:00
00839a844c Update README.md 2014-06-09 19:11:35 +08:00
51c398e107 Update README.md 2014-06-09 19:06:49 +08:00
704078c268 Update README.md 2014-06-09 18:55:37 +08:00
ad1aa3cc00 Merge pull request #70 from geek5nan/develop
添加 Protocol 章节
2014-06-09 18:50:43 +08:00
b59bef21d7 Merge pull request #73 from superkam/develop
Finished Whitespace and comments, Identifiers, Keywords.
2014-06-09 18:50:16 +08:00
Kam
d4b702be0b Finished! 2014-06-09 18:14:38 +08:00
790f04c242 Merge branch 'develop' of https://github.com/geek5nan/the-swift-programming-language-in-chinese into develop
Conflicts:
	source/chapter2/21_Protocols.md
2014-06-09 17:53:40 +08:00
91e2741608 update protocol 2014-06-09 17:51:59 +08:00
6e151661b4 modifi Protocols.md 2014-06-09 17:48:44 +08:00
016b849787 add Protocols section 2014-06-09 17:47:40 +08:00
5ae04a05b1 modifi Protocols.md 2014-06-09 17:42:29 +08:00
8e04431de7 add Protocols section 2014-06-09 17:42:29 +08:00
ca2b5892e7 update 02/10 2014-06-09 17:19:57 +08:00