Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/linux
History
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 		2013-09-13 19:06:09 +08:00
..
CCAccelerometer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.cpp issue #2640: glfw linux version 2013-08-28 12:00:06 +08:00
CCApplication.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCCommon.cpp More CCLog --> log. 2013-07-24 10:46:13 +08:00
CCDevice.cpp [dispatcher] Updating CCDevice.cpp for linux. 2013-09-12 21:39:47 +08:00
CCEGLView.cpp [dispatcher] Other platforms update. 2013-09-12 20:56:57 +08:00
CCEGLView.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCFileUtilsLinux.cpp Adds const in FileUtils 2013-09-06 22:52:55 -07:00
CCFileUtilsLinux.h Adds const in FileUtils 2013-09-06 22:52:55 -07:00
CCGL.h [FIX] testjs 2012-08-02 16:23:31 +08:00
CCImage.cpp Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge 2013-07-31 13:58:25 -07:00
CCPlatformDefine.h Fixes #1317 by http://gcc.gnu.org/wiki/Visibility 2012-09-19 04:59:33 +09:00
CCStdC.cpp [FIX] testjs 2012-08-02 16:23:31 +08:00
CCStdC.h Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h. 2012-08-29 14:49:02 -07:00