This website requires JavaScript.
Explore
Help
Sign In
Lothario
/
axmol
mirror of
https://github.com/axmolengine/axmol.git
Watch
1
Star
0
Fork
You've already forked axmol
0
Code
Issues
Packages
Projects
Releases
Wiki
Activity
dd7bfd7b60
axmol
/
scripting
/
javascript
/
bindings
/
cocos2d_specifics.cpp.REMOV...
1 line
40 B
Plaintext
Raw
Normal View
History
Unescape
Escape
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
b81aba469a4fa7d6ef527533671627541d195e73