pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory ... Conflicts: cocos/base/ccConfig.h cocos/scripting/js-bindings/manual/ScriptingCore.cpp cocos/scripting/js-bindings/manual/ScriptingCore.h cocos/scripting/js-bindings/script/jsb_prepare.js		2016-01-18 16:40:00 +08:00
..
Classes	Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory	2016-01-18 16:40:00 +08:00
proj.android	improve the test case	2015-08-04 11:30:55 +08:00
proj.android-studio	[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0	2015-08-18 22:37:00 +08:00
proj.ios	adds tvOS support	2015-12-28 15:59:36 -08:00
proj.linux	Add js-tests	2015-04-16 18:07:35 +08:00
proj.mac	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
proj.win8.1-universal	updated winrt temporary app certificates expiration dates	2015-10-20 07:39:42 -07:00
proj.win32	Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.	2015-07-22 12:01:34 +08:00
CMakeLists.txt	copy resources in linux	2015-05-26 16:34:04 +08:00