Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

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
c686a8f1f350a7e9f6c87b2267268c21e3f676b1