Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos
History
bmanGH 537af014d8 Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 		2013-10-17 15:25:46 +08:00
..
2d Merge branch 'develop' of https://github.com/bmanGH/cocos2d-x into develop 2013-10-17 15:25:46 +08:00
audio issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
base issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
editor-support Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
gui issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
math/kazmath issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
network Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
physics issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
scripting Update auto-generated submodule manually. 2013-10-16 17:37:34 +08:00
storage/local-storage issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00