Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2d_libs.xcodeproj
History
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 		2013-08-08 10:19:09 +08:00
..
project.pbxproj.BACKUP.23553.pbxproj.REMOVED.git-id update s3tc #2 2013-08-06 11:52:48 +08:00
project.pbxproj.BASE.23553.pbxproj.REMOVED.git-id update s3tc #2 2013-08-06 11:52:48 +08:00
project.pbxproj.LOCAL.23553.pbxproj.REMOVED.git-id update s3tc #2 2013-08-06 11:52:48 +08:00
project.pbxproj.REMOTE.23553.pbxproj.REMOVED.git-id update s3tc #2 2013-08-06 11:52:48 +08:00
project.pbxproj.REMOVED.git-id Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-08-08 10:19:09 +08:00