andyque ae3310bffb Merge branch 'develop' into fix_warnings ... Conflicts: cocos/base/CCConsole.cpp cocos/base/CCConsole.h		2014-03-20 14:50:02 +08:00
..
Classes	Merge pull request #5844 from heliclei/refactor-console-upload	2014-03-20 14:26:59 +08:00
Resources	build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.	2014-03-15 01:19:06 +08:00
proj.android	TestsDemo -> CppTests.	2014-03-11 19:10:36 +08:00
proj.ios	remove unused accelerometer	2014-03-20 14:29:05 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	lua-empty-test, cpp-empty-test work for iOS/Mac	2014-03-11 19:10:36 +08:00
proj.win32	rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.	2014-03-12 15:30:21 +08:00
Android.mk	All tests could run on Android.	2014-03-11 19:10:36 +08:00
CMakeLists.txt	Merge branch 'develop' into fix_gui_to_ui	2014-03-12 10:09:09 +08:00