James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test ... Conflicts: cocos/scripting/auto-generated		2013-12-27 20:18:58 +08:00
..
CocoStudioArmatureTest	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop	2013-12-25 16:47:14 +08:00
CocoStudioComponentsTest	fixed #3457 remove unused comment.	2013-12-26 12:58:34 +08:00
CocoStudioGUITest	fixed #3457 fixes some bug.	2013-12-27 17:21:13 +08:00
CocoStudioSceneTest	fixed #3457 fixes some bug.	2013-12-27 17:21:13 +08:00
CocosBuilderTest	issue #2790: Uses Vector<T> or Map<K, V> as many as possible for CCBReader.	2013-12-09 17:55:56 +08:00
ControlExtensionTest	More warning fixes.	2013-12-18 16:03:07 +08:00
EditBoxTest	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
NetworkTest	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
NotificationCenterTest	issue #2905: testcpp bild ok on Android	2013-10-15 18:00:03 +08:00
Scale9SpriteTest	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD	2013-12-19 17:05:59 +08:00
TableViewTest	long --> ssize_t for TableView callback.	2013-12-26 04:09:24 -08:00
ExtensionsTest.cpp	Add mouse scrolling support for extension test	2013-12-16 17:40:34 +08:00
ExtensionsTest.h	Add mouse scrolling support for extension test	2013-12-16 17:40:34 +08:00