Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix ... Conflicts: tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h		2015-01-12 20:43:55 -08:00
..
Classes	Merge branch 'v3' into renderFix	2015-01-12 20:43:55 -08:00
Resources	Merge branch 'v3' into parse_inneractionframe	2015-01-12 13:38:30 +08:00
proj.android	reverting android properties change	2014-12-15 16:31:22 -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	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	precompiled headers improvements for iOS & Mac	2014-09-23 23:19:25 +04:00
proj.win8.1-universal	fix allocator related compile error on wp8/8.1 and winrt	2014-12-24 10:45:29 +08:00
proj.win32	Fix compile error on WIN32.	2014-12-19 11:49:40 +08:00
proj.wp8-xaml	fix allocator related compile error on wp8/8.1 and winrt	2014-12-24 10:45:29 +08:00
.cocos-project.json	Solve the error when building android for sample projects of engine.	2014-11-18 18:39:53 +08:00
CMakeLists.txt	adding files to cmake files	2014-12-18 18:10:13 -05:00