Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/Cpp
History
Huabing.Xu e935481361 Merge branch 'develop' into Iss2460-glfw-refractor 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	cocos2dx/platform/mac/CCEGLView.mm
	samples/Cpp/TestCpp/proj.linux/main.cpp
	samples/Cpp/TestCpp/proj.win32/main.cpp
 		2013-08-28 13:42:22 +08:00
..
AssetsManagerTest Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into move-auto-generated 2013-08-27 16:59:59 +08:00
HelloCpp fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
SimpleGame fix warnings on ndk-r9 2013-08-26 18:02:51 +08:00
TestCpp Merge branch 'develop' into Iss2460-glfw-refractor 2013-08-28 13:42:22 +08:00