Nite Luo 3421eb8e5d Cleanup the code a bit before implement sprite batching		2013-11-07 10:09:53 -08:00
..
2d	Cleanup the code a bit before implement sprite batching	2013-11-07 10:09:53 -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	perfect vs-project configuration	2013-10-31 10:51:38 +08:00
gui	perfect vs-project configuration	2013-10-31 10:51:38 +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	Merge pull request #4030 from dumganhar/spv25	2013-10-31 07:08:09 -07:00
storage/local-storage	perfect vs-project configuration	2013-10-31 10:51:38 +08:00