Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/textures
History
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 		2011-01-20 11:18:35 +08:00
..
CCPVRTexture.cpp issue #289, fix some warnings 2011-01-17 21:16:25 +08:00
CCTexture2D.cpp Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-19 15:29:08 +08:00
CCTextureAtlas.cpp Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-19 15:29:08 +08:00
CCTextureCache.cpp move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00