Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Lua/TestLua
History
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 		2013-12-19 17:05:59 +08:00
..
Classes issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
Resources Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
proj.android Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
proj.ios issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
proj.linux issue #3037:Modify platform build config 2013-11-01 11:18:02 +08:00
proj.mac issue #2794:Add LuaObjectCBridge and related test sample 2013-10-31 15:26:38 +08:00
proj.win32 issue #3037:Modify vs2012 config 2013-11-04 14:43:22 +08:00
.gitignore issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00
CMakeLists.txt issue #3113: Updating CMakeLists.txt, Improve Copying files. 2013-11-06 10:57:36 +08:00