axmol/cocos2dx/include
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
..
CCDeprecated.h [Dispatcher] New event dispatcher, first commit. 2013-09-11 22:09:34 +08:00
CCEventType.h issue #2129: Removing CC prefix for cocos2dx module. 2013-06-20 14:13:12 +08:00
CCProtocols.h issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
ccConfig.h revert back fps interval to 0.1s 2013-08-29 20:05:14 -07:00
ccMacros.h ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
ccTypes.h Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 2013-09-13 19:06:09 +08:00
cocos2d.h file mode changed, cocos2d.h from 100755 -> 100644 2013-09-13 16:37:47 +08:00