mirror of https://github.com/axmolengine/axmol.git
e935481361
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 |
||
---|---|---|
.. | ||
.cproject | ||
.project | ||
Makefile | ||
cocos2dx.mk | ||
cocos2dx.prf | ||
cocos2dx.pri |