Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id

1 line
40 B
Plaintext
Raw Normal View History

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
a4b4e22fa9c7b5faa973bb5189ea8db27307df37