samuele3hu 6fbf1b4cdf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test		2014-03-27 11:21:20 +08:00
..
project	Replace NativeActivity with Cocos2dActivity and modify lua android project setting.	2014-03-27 11:18:13 +08:00
res/cocosbuilderRes/ccb	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
src	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00