Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples
History
James Chen 79700118db Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 
Conflicts:
	cocos/base/CCConsole.cpp
	cocos/base/CCConsole.h
 		2013-12-05 16:26:04 +08:00
..
Cpp Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 2013-12-05 16:26:04 +08:00
Javascript Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Lua Fix typos 2013-11-29 12:09:38 -05:00
CMakeLists.txt issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +08:00