axmol/cocos/editor-support/cocostudio/WidgetReader
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
2014-07-11 13:55:13 +08:00
..
ButtonReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
CheckBoxReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
ImageViewReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
LayoutReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
ListViewReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
LoadingBarReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
PageViewReader add constness to some function 2014-06-23 10:12:54 +08:00
ScrollViewReader Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
SliderReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
TextAtlasReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
TextBMFontReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
TextFieldReader fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
TextReader Merge branch 'v3' into addStudio1.4 2014-07-11 13:55:13 +08:00
WidgetReader.cpp fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
WidgetReader.h fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
WidgetReaderProtocol.h fix windows compile error 2014-06-23 18:29:23 +08:00