bmanGH b7dcf51af3 Merge remote-tracking branch 'upstream/develop' into develop		2013-10-24 17:10:12 +08:00
..
2d	Merge remote-tracking branch 'upstream/develop' into develop	2013-10-24 17:10:12 +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	issue #2905:ndk-r8e build ok now	2013-10-23 17:44:20 +08:00
gui	issue #2905:ndk-r8e build ok now	2013-10-23 17:44:20 +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	Merge pull request #3996 from boyu0/iss2771_physical	2013-10-22 20:45:55 -07:00
scripting	fix conflicts	2013-10-22 18:36:13 +08:00
storage/local-storage	issues #2905:add new vs project	2013-10-21 22:21:11 +08:00