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 |
YuLei Liao
|
712541d0ef
|
* update tolua++ packages
|
2012-02-02 14:26:38 +08:00 |
unknown
|
54242d709e
|
commit some pkg files
|
2011-07-08 22:32:54 +08:00 |
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
minggo
|
9c49e27bf1
|
add extensions & tools directory
|
2011-06-14 14:31:25 +08:00 |