Commit Graph

1442 Commits

Author SHA1 Message Date
bf556651fd Merge remote-tracking branch 'origin/gh-pages' into gh-pages 2015-07-28 21:40:51 +08:00
0a26e09757 Merge branch 'xtymichael-section123' into gh-pages 2015-07-28 21:35:06 +08:00
2526376051 conflict 2015-07-28 21:34:58 +08:00
7cf4ecc8c7 cp1,2,3
cp 1,2,3 final draft
2015-07-27 11:49:44 -04:00
6c61e7906d Merge pull request #430 from 100mango/patch-5
更新值捕获章节
2015-07-25 20:22:55 +08:00
0fc166d290 Merge pull request #429 from clarenceli/gh-pages
fix some error code
2015-07-25 20:22:36 +08:00
a0863d558a 更新值捕获章节 2015-07-25 17:09:14 +08:00
19cfcda5db fix some error code 2015-07-24 23:58:56 +08:00
369cc30e82 Merge pull request #428 from Lenhoon/develop
update to 2015 7 21
2015-07-24 22:11:12 +08:00
22999eaef2 Merge pull request #427 from wangmchn/gh-pages
Update 14_Initialization.md
2015-07-24 22:11:04 +08:00
c599703ff3 update to 2015 7 21 2015-07-24 20:48:32 +08:00
21306131c0 Update 14_Initialization.md 2015-07-24 15:45:28 +08:00
7edc0faa57 Merge pull request #426 from KYawn/gh-pages
2015/7/23 更新
2015-07-23 21:07:36 +08:00
98affd86a9 Merge branch 'develop' into gh-pages 2015-07-23 18:08:42 +08:00
7db8009b1f chapter3 part6 objc attribute 2015-07-23 18:06:55 +08:00
f39bd06843 add author info 2015-07-22 21:45:29 +08:00
8d70b6daf8 fix conflict 2015-07-22 21:44:35 +08:00
6110075718 Merge pull request #425 from lyojo/lyojo
可空链式调用翻译完成
2015-07-22 21:35:20 +08:00
6467f73be6 可空链式调用翻译完成 2015-07-22 21:32:53 +08:00
ddea3f96c9 Merge pull request #424 from chenyangcun/dev
替换println 为 print
2015-07-21 22:02:59 +08:00
26a52d2111 Merge pull request #422 from lyojo/lyojo
错误处理翻译完成
2015-07-21 18:27:25 +08:00
2a51e99718 错误处理翻译完成 2015-07-21 17:56:10 +08:00
1ffaef1bd5 替换println 为 print 2015-07-21 17:35:04 +08:00
0779f979ac 修正集合类型在Swift 2.0 sort方法的使用 2015-07-21 17:34:44 +08:00
7e8f4b075d Merge pull request #421 from SkyJean/develop
类和结构体逐字翻译完成
2015-07-20 22:03:36 +08:00
c7d78d5260 类和结构体逐字翻译完成 2015-07-20 21:08:46 +08:00
8d1a1b1abf Merge pull request #420 from AlanMelody/develop
04_Collection Types && 05_Control Flow翻译完成
2015-07-20 21:06:26 +08:00
8c59b9c844 第五章ControlFlow基本翻译完成 2015-07-20 19:53:43 +08:00
f6533d5bd0 第四章集合类型翻译完成 2015-07-20 19:53:43 +08:00
f95956a078 Merge branch 'dreamkidd-gh-pages' into gh-pages 2015-07-19 19:31:58 +08:00
6fb5d5ce2f fix conflict 2015-07-19 19:31:31 +08:00
b722eb877d 更新完成 2015-07-19 18:43:13 +08:00
64033ac6e2 Merge pull request #418 from paper/patch-1
数组类型 示例代码一点小问题
2015-07-16 22:00:34 +08:00
1eee23534f Merge pull request #416 from xtymichael/section123
cp01 cp02
2015-07-16 21:59:29 +08:00
ab81dcf1d6 数组类型 示例代码一点小问题 2015-07-16 16:46:08 +08:00
4eca19fa31 Merge pull request #415 from wangmchn/gh-pages
格式修改
2015-07-15 21:52:30 +08:00
e1c395df84 格式修改 2015-07-15 18:44:23 +08:00
e2ccc79fb9 Update 04_Collection_Types.md 2015-07-15 18:43:49 +08:00
5105a2c404 cp01 cp02
cp 01 02 修改
2015-07-14 16:05:34 -04:00
8c75dc5a64 update to Function_Parameter_Names 2015-07-15 00:26:47 +08:00
553e257bfe update:function
add:functions with Multiple parameters
2015-07-14 23:28:15 +08:00
aa08ed8959 Merge pull request #414 from AlanMelody/develop
Basic Operators翻译校对完成
2015-07-14 20:02:32 +08:00
ea1dd5caea 修改一处冗余的空格 2015-07-12 23:36:27 +08:00
38b3871353 基本操作符部分翻译校对完成 2015-07-12 23:17:10 +08:00
ac753325af Merge pull request #413 from Lenhoon/develop
Swift2.0 声明部分翻译完成
2015-07-11 07:09:31 +08:00
5a018759c3 translate completed,but some links need to add 2015-07-10 23:55:51 +08:00
bea57c8ffb 新版 2015-07-10 23:04:56 +08:00
b7f61209fa 新版 2015-07-10 23:03:23 +08:00
1d1ff16416 Merge pull request #412 from futantan/develop
完成 Protocols翻译和校对
2015-07-10 23:01:16 +08:00
3a5201d4ca 格式修改 2015-07-09 11:28:24 +08:00