Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/template/CCXAppWiz.vs/CCXAppWiz/Scripts/1033
History
yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXUIImage_win32.cpp
	cocos2dx/platform/win32/CCXUIImage_win32.h
	tests/test.win32/test.win32.vcproj
 		2011-01-28 14:33:47 +08:00
..
default.js Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-01-28 14:33:47 +08:00