Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tools
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
..
android-mk-generator fix path for windows 2013-11-15 18:05:24 +08:00
bindings-generator@a8e5123121 Updates submodule of bindings-generator. 2013-12-19 11:50:45 +08:00
closure-compiler improve obfuscate.py to be more reliable. 2013-04-06 22:00:52 +08:00
cocos2d-console@3556d41429 issue #2826: Updating cocos2d-console submodule. 2013-11-01 10:46:06 +08:00
cpp-best-practise-formatter issue #3215: Updating comments for this tool. 2013-11-16 23:09:45 +08:00
jenkins-scripts issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
localvartoauto #closed #2434: refactor LocalVarToAuto.py to use the PathUtils and fix some errors 2013-08-22 13:40:57 +08:00
make-package closed #2446: Add a tool to auto export releasing zip file 2013-08-26 16:57:10 +08:00
project-creator fixed typos 2013-11-10 08:25:01 -03:00
pylib replace os.path.samefile 2013-10-30 16:43:19 +08:00
tojs Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 2013-12-19 17:05:59 +08:00
tolua [scripting] Ignores Director::getRenderer for bindings. 2013-12-18 10:15:42 +08:00
travis-scripts issue #2790:Open travis support 2013-12-10 18:26:10 +08:00
__init__.py add creating project script in root 2013-07-26 10:50:37 +08:00
android-emulator-README.md Clearer description of command line options 2013-03-19 16:08:38 -07:00