Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/2d/platform/linux
History
Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements 
Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
 		2014-01-27 10:52:35 -08:00
..
CCApplication.cpp more fixes for new GLView API 2014-01-23 16:04:11 -08:00
CCApplication.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCCommon.cpp cocos2d::log() moved to CCConsole 2014-01-10 19:04:07 -08:00
CCDevice.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCFileUtilsLinux.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCFileUtilsLinux.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCGL.h issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCImage.cpp closed #3867: "Testing empty labels" in LabelTest crashes on Linux platform. 2014-01-27 10:31:24 +08:00
CCPlatformDefine.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCStdC.cpp update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCStdC.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00