CaiWenzhi 4843046d17 Merge GUI to develop step 1;		2013-09-16 17:12:15 +08:00
..
Armature	Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase	2013-09-13 19:06:09 +08:00
Components	[dispatcher] Renaming 'registerEventListenerXXX' to 'addEventListenerXXX'.	2013-09-14 09:02:49 +08:00
GUI	Merge GUI to develop step 1;	2013-09-16 17:12:15 +08:00
Json	1. remove any unused functions.	2013-09-10 11:02:50 +08:00
Reader	Merge GUI to develop step 1;	2013-09-16 17:12:15 +08:00