Dhilan007 1247760d95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs ... Conflicts: cocos/2d/CCLabel.cpp		2014-03-26 11:15:48 +08:00
..
Classes	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs	2014-03-26 11:15:48 +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	Remove NativeActivity	2014-03-24 19:57:29 -07: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	revert vcxproj files	2014-03-24 10:50:48 +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