James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer ... Conflicts: cocos/2d/CMakeLists.txt		2013-12-17 15:50:24 +08:00
..
CocoStudioArmatureTest	Fix typos	2013-11-29 12:09:38 -05:00
CocoStudioComponentsTest	fixed #3185 support for html5.	2013-11-14 17:03:45 +08:00
CocoStudioGUITest	optimize guireader	2013-11-11 18:22:14 +08:00
CocoStudioSceneTest	fixed ui anmation crash when stop animation	2013-11-19 00:57:22 +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	added | operator for Control::EventType	2013-11-05 23:55:24 -03: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	Constructors are protected	2013-11-13 15:55:36 -08:00
TableViewTest	[Win32] fix argument type.	2013-12-17 15:11:37 +09: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