axmol/cocos/2d/platform/mac
Ricardo Quesada 1b6dfcda40 Merge branch 'develop' into cceglview_in_desktop
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-01-22 11:21:16 -08:00
..
CCApplication.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCApplication.mm update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCCommon.mm closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context 2014-01-22 10:16:34 +08:00
CCDevice.cpp First step in simplifying the mac platform 2014-01-21 15:44:01 -08:00
CCDirectorCaller.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCDirectorCaller.mm closed #3808: Removes unused files for MAC platform after using glfw3 to create opengl context 2014-01-22 10:16:34 +08:00
CCGL.h update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCImage.mm update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
CCPlatformDefine.h 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