Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests
History
CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/gui/UIButton.cpp
	cocos/gui/UIButton.h
	cocos/gui/UIWidget.h
 		2014-03-05 16:52:31 +08:00
..
Classes Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 16:52:31 +08:00
Resources Add custom widget and reader 2014-03-04 16:51:35 +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