Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete ... # By CaiWenzhi (4) and others # Via minggo (7) and others * develop: fix asynchronize loading bug [AUTO] : updating submodule reference to latest autogenerated bindings fixed #3185 support for html5. fixed bug of widget fixed bugs of widget fixed #3185 ComponentTest and SceneTest NULL to nullptr. Add deprecated functions of class TextureCache fix warning set z order after reorder fixed #3185 replace NULL to nullptr. add "override" fixed #3185 Modify code criterion Conflicts: cocos/editor-support/cocostudio/CCSGUIReader.cpp cocos/editor-support/cocostudio/CCSSceneReader.cpp		2013-11-15 09:44:29 +08:00
..
Cpp	Merge branch 'develop' into free_instead_of_delete	2013-11-15 09:44:29 +08:00
Javascript	closed #3108: add -fsigned-char to make char to signed as default	2013-11-04 10:48:45 +08:00
Lua	issue #2868:Modify armature test samples and add more armature test samples	2013-11-13 18:18:29 +08:00
CMakeLists.txt	issue #3113: [Linux] Adding options for modules.	2013-11-06 19:17:34 +08:00