James Chen edb2ad0933 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into ccs-binding ... Conflicts: cocos/editor-support/cocostudio/TriggerMng.cpp		2013-12-30 21:06:57 +08:00
..
CocoStudioArmatureTest	Merge pull request #4728 from dabingnn/develop_removeCommandPool	2013-12-29 21:53:12 -08:00
CocoStudioComponentsTest	More warning fixes.	2013-12-28 14:34:52 +08:00
CocoStudioGUITest	Fixed bugs	2013-12-30 14:40:49 +08:00
CocoStudioSceneTest	[JSB] Adds trigger bindings for CocoStudio.	2013-12-30 20:57:46 +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	Bug fixes for cocostudio.	2013-12-27 20:54:05 +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