Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3		2015-05-25 17:01:29 +08:00
..
Classes	Merge remote-tracking branch 'upstream/v3' into physics	2015-05-21 21:15:42 +08:00
proj.android	Support build & run Android Studio project in console.	2015-05-25 16:53:36 +08:00
proj.android-studio	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
proj.ios	Add js-tests	2015-04-16 18:07:35 +08:00
proj.linux	Add js-tests	2015-04-16 18:07:35 +08:00
proj.mac	Add js-tests	2015-04-16 18:07:35 +08:00
proj.win8.1-universal	added libbullet to Windows 8.1 Universal App projects	2015-05-20 08:01:01 -07:00
proj.win32	add CC_ENABLE_BULLET_INTEGRATION=1 to js project	2015-05-17 23:11:17 +08:00
CMakeLists.txt	fix resource path for js-tests	2015-05-15 16:23:43 +08:00