zhangbin 61cf0ad28b Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb		2015-04-23 15:46:19 +08:00
..
Classes	removed CC_PLATFORM_WINRT messagebox code	2015-04-20 10:32:11 -07:00
Resources	fix libpng warning	2014-12-27 20:47:59 +08:00
proj.android	Fixed compiling and linking error of lua tests when using NDK r10 above.	2014-11-27 13:56:15 +08:00
proj.ios	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +08:00
proj.linux	updates CMakeLists.txt	2014-03-11 19:10:37 +08:00
proj.mac	Squashed commit of the following:	2014-09-09 12:18:31 -07:00
proj.win8.1-universal	updated expiration date of project certificates	2015-03-09 08:31:06 -07:00
proj.win32	Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders.	2015-02-10 16:23:34 +03:00
.cocos-project.json	Update the js-tests project files.	2015-04-21 15:30:47 +08:00
CMakeLists.txt	mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)	2014-11-17 01:42:04 +03:00