chuanweizhang 6e871e8803 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop ... Conflicts: template/multi-platform-js/Classes/AppDelegate.cpp		2013-12-25 18:12:16 +08:00
..
multi-platform-cpp	modify create_project	2013-12-25 15:53:47 +08:00
multi-platform-js	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-12-25 18:12:16 +08:00
multi-platform-lua	modify create_project	2013-12-25 15:53:47 +08:00