yinkaile 2d3df69982 fix add display		2013-10-29 16:57:06 +08:00
..
2d	Merge pull request #4008 from dumganhar/touchevent-refactor	2013-10-29 00:46:56 -07: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	fix add display	2013-10-29 16:57:06 +08:00
gui	EventDispatcher is managed by Director now, like Scheduler and ActionManager.	2013-10-26 15:04:01 +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	Updating auto generated binding codes.	2013-10-29 15:09:13 +08:00
storage/local-storage	issues #2905:add new vs project	2013-10-21 22:21:11 +08:00