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
..
HelloLua	issue #2800:Can not hide status bar on iOS 7	2013-09-13 16:07:02 +08:00
TestLua	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase	2013-09-13 19:06:09 +08:00