axmol/tests
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
..
Classes Merge branch 'develop' into visit_draw_improved 2014-03-03 11:27:42 -08:00
Resources issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
proj.android Modify the depend project path for project "TestCpp". 2014-02-28 17:29:12 +08:00
proj.ios issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
proj.linux issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
proj.mac issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
proj.win32 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
Android.mk issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
CMakeLists.txt issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00