James Chen 4b2165e648 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio		2013-07-13 19:24:41 +08:00
..
AssetsManagerTest	issue #2397: sharedNotificationCenter --> getInstance	2013-07-12 14:17:42 +08:00
HelloCpp	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
SimpleGame	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
TestCpp	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio	2013-07-13 19:24:41 +08:00