Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/cpp-tests
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
..
Classes Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
Resources Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 09:37:39 +08:00
proj.android add new line at the end of a file to *.mk 2014-06-19 20:43:27 +09:00
proj.ios Fixes compiler warnings for mac and ios 2014-05-22 16:34:16 -03:00
proj.linux
…
proj.mac issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
proj.win32 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
proj.wp8-xaml added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
.cocos-project.json issue #4674: Re-added deleted source files. 2014-05-04 14:37:55 +08:00
Android.mk fixed android compile failed 2014-06-15 13:10:44 +08:00
CMakeLists.txt Merge pull request #6945 from John-He-928/mingw-build 2014-06-19 22:08:28 +08:00