zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse		2014-07-01 16:36:37 +08:00
..
CocoStudioActionTimelineTest	fix warnings	2014-06-26 16:15:02 +08:00
CocoStudioArmatureTest	Merge branch 'v3' into cleanupBinaryLoader	2014-06-23 09:37:39 +08:00
CocoStudioComponentsTest	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
CocoStudioSceneTest	1、Update binary parse lib.	2014-07-01 16:31:17 +08:00
CocosBuilderTest	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
ControlExtensionTest	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
EditBoxTest	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
NetworkTest	change immediateSend to sendImmediate	2014-06-22 11:39:39 +08:00
NotificationCenterTest	Squashed commit of the following:	2014-05-14 10:07:09 -07:00
Scale9SpriteTest	Add new line at the end of a file to *.h	2014-06-19 20:45:49 +09:00
TableViewTest	Adds setNormalizedPosition()	2014-05-30 16:42:05 -07:00
ExtensionsTest.cpp	change TimelineAction to ActionTimeline	2014-06-13 16:03:03 +08:00
ExtensionsTest.h	Squashed commit of the following:	2014-05-14 10:07:09 -07:00