James Chen 1339ef7ecb [JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer.		2013-10-25 15:20:06 +08:00
..
2d	[Dispatcher] Removing unused codes in Layer.	2013-10-25 15:19:25 +08:00
audio	fix conflicts	2013-10-22 18:36:13 +08:00
base	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-10-18 15:34:13 +08:00
editor-support	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +08:00
gui	Adding onEnterHook, onXXXHook for Node.	2013-10-25 10:53:45 +08:00
math/kazmath	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
network	fix conflicts	2013-10-22 18:36:13 +08:00
physics	issue #2771: fix some compile error in win32	2013-10-23 18:52:09 +08:00
scripting	[JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer.	2013-10-25 15:20:06 +08:00
storage/local-storage	issues #2905:add new vs project	2013-10-21 22:21:11 +08:00