Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/proj.linux
History
James Chen 208f705845 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 		2013-09-16 18:18:23 +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 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 2013-09-16 18:18:23 +08:00
extensions.prf Linux: added project part for QtCreator. 2013-06-02 10:15:14 +04:00