Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/lua
History
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
 		2012-04-15 15:46:01 +08:00
..
cocos2dx_support Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-04-15 15:46:01 +08:00
lua issue #973: refactor lua support 2012-02-10 12:02:46 +08:00
proj.android/jni issue #973: refactor lua support 2012-02-10 12:02:46 +08:00
proj.win32 issue #973: refactor lua support 2012-02-10 12:02:46 +08:00
tolua move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00