Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete ... # By minggo (12) and others # Via minggo (18) and others * develop: (78 commits) [AUTO] : updating submodule reference to latest autogenerated bindings Update CHANGELOG[ci skip] Update AUTHORS [ci skip] fix bug: cccolor to jsval function has error in jsb [ci skip] [ci skip] [ci skip] [ci skip] [ci skip] C++11: NULL -> nullptr [ci skip] Fix: UserDefault::createXMLFile with correct XML definition. [ci skip] [ci skip] [ci skip] Fix bug: rename const with under line seperator [AUTO] : updating submodule reference to latest autogenerated bindings Fix bug: Z fighting on TransitionScenePageTurn Fixed bugs Modify reader and fixed bugs ... Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.cpp		2013-11-14 14:47:01 +08:00
..
bindings	Merge branch 'develop' into free_instead_of_delete	2013-11-14 14:47:01 +08:00
script	Adding cc.TextureCache.getInstance() to jsb_deprecated.js.	2013-11-11 16:45:44 +08:00