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 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 		2013-07-16 16:33:02 +08:00
..
Cpp Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 2013-07-16 16:33:02 +08:00
Javascript Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 2013-07-16 16:33:02 +08:00
Lua issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
samples.xcodeproj [iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects. 2013-07-16 15:35:13 +08:00