axmol/cocos2dx/proj.linux
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
..
.cproject Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
.project Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
Makefile updata: [cocos2d's code style] add space before backslash and return before else if 2013-08-16 16:10:39 +08:00
cocos2dx.mk issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
cocos2dx.prf Enabled c++0x flag, use OpenAL audio backend by default. 2013-06-04 14:29:29 +04:00
cocos2dx.pri Enabled c++0x flag, use OpenAL audio backend by default. 2013-06-04 14:29:29 +04:00