Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain

This commit is contained in:
tangziwen 2015-04-03 16:58:27 +08:00
commit 72f5121959
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit d20bd95b520374565d2c12b37f9fefc732f41891
Subproject commit af67671bfd8394e8a5e13d702e57f3fd7eaa5c78