Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples
History
samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 		2013-10-29 11:45:19 +08:00
..
Cpp Android: add xlargeScreens="true" to supports-screens 2013-10-28 23:12:51 +01:00
Javascript Android: add xlargeScreens="true" to supports-screens 2013-10-28 23:12:51 +01:00
Lua Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-10-29 11:45:19 +08:00