Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/platform/qt5
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
..
AccelerometerListener.cpp Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
AccelerometerListener.h Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
CCAccelerometer.cpp Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
CCAccelerometer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCApplication.cpp Qt 5: Build fixes for Qt 5 platform 2013-08-01 09:20:17 +02:00
CCApplication.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCCommon.cpp Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
CCDevice.cpp [dispatcher] Other platforms update. 2013-09-12 20:56:57 +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
CCFileUtilsQt5.cpp Adds const in FileUtils 2013-09-06 22:52:55 -07:00
CCGL.h Platform abstraction implementation with Qt 5 2013-07-24 20:18:43 +02:00
CCPlatformDefine.h Platform abstraction implementation with Qt 5 2013-07-24 20:18:43 +02:00
CCStdC.h Platform abstraction implementation with Qt 5 2013-07-24 20:18:43 +02:00