samuele3hu d06bb83f19 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix ... Conflicts: tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua		2014-03-12 14:33:39 +08:00
..
project	fix linux compile error	2014-03-12 11:03:23 +08:00
res/cocosbuilderRes/ccb	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
src	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix	2014-03-12 14:33:39 +08:00