James Chen 32406efec2 Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog ... Conflicts: cocos2dx/proj.linux/cocos2dx.mk		2013-04-10 14:17:23 +08:00
..
AssetsManagerTest	- update README files	2013-03-21 16:04:53 +01:00
HelloCpp	- changed cocos2d mac project to support universal build and x86	2013-03-23 16:04:51 +00:00
SimpleGame	added sample game xcode project for mac	2013-03-23 17:21:26 +00:00
TestCpp	Merge branch 'newlines_in_cclog' of https://github.com/sbc100/cocos2d-x into sbc100-newlines_in_cclog	2013-04-10 14:17:23 +08:00