Commit Graph

96 Commits

Author SHA1 Message Date
fc6a6c501a fix 3.9,resolve 2.4 conflict 2014-06-15 09:36:10 +08:00
81b31affd4 fix 3.10 statements 2014-06-15 00:17:29 +08:00
2500a7f130 fix 3.8 generic parameters and arguments 2014-06-15 00:01:26 +08:00
29aed911e2 fix 3.7 patterns 2014-06-14 23:49:34 +08:00
2294c9020f fix 3.6 attributes 2014-06-14 23:31:09 +08:00
df9d6bd803 merge 2.21,3.5 confilicts 2014-06-14 23:06:20 +08:00
2953510924 merge 2.21,2.23,3.5 confilicts 2014-06-14 23:06:19 +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
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
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
a516af6a53 fix 他 2014-06-14 17:25:03 +08:00
1c10a65bd3 统一标准 2014-06-14 16:43:18 +08:00
7011436cef modify right back 2014-06-14 15:57:52 +08:00
9547fd69fe modify 2014-06-14 15:49:19 +08:00
8519bfad0a correct declarations grammar 2014-06-14 14:18:51 +08:00
1f351fad77 correct attributes grammar 2014-06-14 13:47:00 +08:00
5d96ced584 a trivial change 2014-06-14 13:36:50 +08:00
a5911a9e43 modify pattern code style 2014-06-14 13:33:11 +08:00
00b20d48e1 correct 08_Generic_Parameters_and_Arguments 2014-06-13 17:19:20 +08:00
470c7dfa77 correct [expressions] binary expressions header link 2014-06-13 15:54:46 +08:00
7a0d0266c9 remote extra html file 2014-06-13 15:50:50 +08:00
1f5f7d19e0 add [expression] header links 2014-06-13 15:43:19 +08:00
d8073ee492 remove bottom link of 08_Generic_Parameters_and_Arguments 2014-06-13 15:35:27 +08:00
35d2510009 修改02_Lexical_Structure.md里的代码块标示 2014-06-13 12:04:24 +08:00
463548b6a9 new branch to rebase 2014-06-13 09:43:12 +08:00
6bf59ea7a2 Merge pull request #110 from stanzhai/develop
【语法总结】v1.0,修复语法说明全跑到一行的问题
2014-06-12 14:39:14 +08:00
1d88da2bd5 解决空格的问题 2014-06-12 12:46:57 +08:00
af93ebaa9f 完成初校 2014-06-12 12:46:57 +08:00
fea2f795a5 完成初校 2014-06-12 12:46:57 +08:00
c159a931e0 fix summary of the grammar 2014-06-12 09:56:03 +08:00
75426a3479 ver 1.0 2014-06-12 07:40:02 +08:00
feae1c551f 修改:当conform的宾语为protocol的时候,conform译为“遵循”。 2014-06-11 00:16:33 +08:00
9698ddc391 add underline ----------------- 2014-06-10 20:00:15 +08:00
b75e5d88ed Merge pull request #88 from fd5788/gh-pages
修改一些语法格式及翻译错误
2014-06-10 15:53:33 +08:00
49c28ff603 Merge pull request #82 from sg552/gh-pages
粗略校对完毕: reference expression
2014-06-10 15:05:36 +08:00
b479452a93 修改一些错误 2014-06-10 15:04:08 +08:00
31910822fb reference expression: 彻底搞定了格式。翻译完成 2014-06-10 14:33:41 +08:00
2c63d9957b Merge branch 'develop' of https://github.com/coverxit/the-swift-programming-language-in-chinese into develop
Conflicts:
	source/chapter2/05_Control_Flow.md
2014-06-10 13:20:47 +08:00
3cf85e3070 no message 2014-06-10 13:15:08 +08:00