Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
project	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
res	Add Lua bindings for controller and related test case project	2014-07-09 18:05:02 +08:00
src	Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes	2014-10-14 21:34:55 +08:00
.cocos-project.json	Add files & configuration for android studio support in console.	2015-05-21 16:34:03 +08:00