Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/editor-support/cocostudio/proj.win32
History
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 		2014-06-23 09:37:39 +08:00
..
libCocosStudio.vcxproj Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
libCocosStudio.vcxproj.filters Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
libCocosStudio.vcxproj.user issues #2905:add new vs project 2013-10-21 22:21:11 +08:00