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
..
cpp-empty-test	add regular support in Node::enumerateChildren()	2014-07-02 17:07:36 +08:00
cpp-tests	Merge branch 'v3' into addStudio1.4	2014-07-11 13:55:13 +08:00
game-controller-test	Enabled nibiru\moga\ouya controller support.	2014-07-11 09:57:26 +08:00
lua-empty-test	add regular support in Node::enumerateChildren()	2014-07-02 17:07:36 +08:00
lua-game-controller-test	Add newline for some files	2014-07-11 12:00:43 +08:00
lua-tests	Update ini configure and bindings-generator submodule	2014-07-08 15:17:46 +08:00