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	build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.	2014-03-15 01:19:06 +08:00
src	remove deprecated code in lua tests & template	2014-03-26 19:42:07 +08:00