使用Quick-Cocos2d-x搭建一个横版过关游戏(一)
Merge branch 'master' of https://github.com/rainswan/cocos-docs; branch 'master' of https://github.com/chukong/cocos-docs

* 'master' of https://github.com/rainswan/cocos-docs:

# By Park Hyun Chen (19) and others
# Via u0u0 (21) and others
* 'master' of https://github.com/chukong/cocos-docs: (61 commits)
  updated catalog structures
  updated catalog structure
  change director name
  change name
  json parse
  update ko.md
  update ko.md
  update ko.md
  Create ko.md
  Update ko.md
  Update ko.md
  Create ko.md
  add 骨骼动画详解－cocostudio
  Update ko.md
  Update ko.md
  Update en.md
  Create ko.md
  Create ko.md
  add audio-and-effect to v3
  Update ko.md
  ...
使用Quick-Cocos2d-x搭建一个横版过关游戏(二)
add exe link
更新教程1
Update action/zh.md

精力-->精灵
更新横版过关第一篇文章
Merge branch 'master' of https://github.com/chukong/cocos-docs

# By Park Hyun Chen (8) and others
# Via u0u0 (3) and others
* 'master' of https://github.com/chukong/cocos-docs: (22 commits)
  add zh.md for parkour game
  update ko.md
  Update ko.md
  Update ko.md
  update ko.md
  update js engine link and mac package link
  Update ko.md
  Create ko.md
  Update ko.md
  Create ko.md
  Update ko.md
  Create ko.md
  update user guide to 1.0.0-rc0
  update cocos code ide get started
  [Cocos2d-JS] RC1 release docs in catalogs
  fix link error
  mv code-ide documents out from studio
  update ide document to 1.0.0-rc0
  [Cocos2d-JS] RC1 release docs
  update Code IDE document to 1.0.3.rc0
  ...
更改文件名
Merge pull request #407 from zhsso/patch-1

Update action/zh.md
Merge pull request #406 from Yangtb/master

update httpclient/zh.md
[Cocos2d-JS] Add old en docs into release notes
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
add httpclient to catalog
Merge pull request #411 from gloryming/master

add httpclient to catalog
Merge pull request #409 from rainswan/master

修改横版过关教程一，添加横版过关教程二
Merge pull request #410 from pandamicro/master

[Cocos2d-JS] Add old en docs into release notes
Merge pull request #405 from honghui/master

add exe link
new html5 article.
Merge pull request #412 from u0u0/master

new html5 article.