Merge pull request #5947 from CocosRobot/update_lua_bindings_1395726548

[AUTO]: updating luabinding automatically

cocos/scripting/lua-bindings/auto/api/ControlStepper.lua

@@ -11,7 +11,7 @@
 --------------------------------
 -- @function [parent=#ControlStepper] getMinusLabel 
 -- @param self
--- @return LabelTTF#LabelTTF ret (return value: cc.LabelTTF)
+-- @return Label#Label ret (return value: cc.Label)
         
 --------------------------------
 -- @function [parent=#ControlStepper] setWraps 
@@ -42,7 +42,7 @@
 --------------------------------
 -- @function [parent=#ControlStepper] getPlusLabel 
 -- @param self
--- @return LabelTTF#LabelTTF ret (return value: cc.LabelTTF)
+-- @return Label#Label ret (return value: cc.Label)
         
 --------------------------------
 -- @function [parent=#ControlStepper] stopAutorepeat 
@@ -66,7 +66,7 @@
 --------------------------------
 -- @function [parent=#ControlStepper] setMinusLabel 
 -- @param self
--- @param #cc.LabelTTF labelttf
+-- @param #cc.Label label
         
 --------------------------------
 -- @function [parent=#ControlStepper] setValue 
@@ -107,7 +107,7 @@
 --------------------------------
 -- @function [parent=#ControlStepper] setPlusLabel 
 -- @param self
--- @param #cc.LabelTTF labelttf
+-- @param #cc.Label label
         
 --------------------------------
 -- @function [parent=#ControlStepper] create 

cocos/scripting/lua-bindings/auto/api/ControlSwitch.lua

@@ -24,7 +24,7 @@
 -- @return bool#bool ret (return value: bool)
         
 --------------------------------
--- overload function: initWithMaskSprite(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.LabelTTF, cc.LabelTTF)
+-- overload function: initWithMaskSprite(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label)
 --          
 -- overload function: initWithMaskSprite(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite)
 --          
@@ -34,8 +34,8 @@
 -- @param #cc.Sprite sprite
 -- @param #cc.Sprite sprite
 -- @param #cc.Sprite sprite
--- @param #cc.LabelTTF labelttf
--- @param #cc.LabelTTF labelttf
+-- @param #cc.Label label
+-- @param #cc.Label label
 -- @return bool#bool ret (retunr value: bool)
 
 --------------------------------
@@ -52,7 +52,7 @@
 --------------------------------
 -- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite)
 --          
--- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.LabelTTF, cc.LabelTTF)
+-- overload function: create(cc.Sprite, cc.Sprite, cc.Sprite, cc.Sprite, cc.Label, cc.Label)
 --          
 -- @function [parent=#ControlSwitch] create
 -- @param self
@@ -60,8 +60,8 @@
 -- @param #cc.Sprite sprite
 -- @param #cc.Sprite sprite
 -- @param #cc.Sprite sprite
--- @param #cc.LabelTTF labelttf
--- @param #cc.LabelTTF labelttf
+-- @param #cc.Label label
+-- @param #cc.Label label
 -- @return ControlSwitch#ControlSwitch ret (retunr value: cc.ControlSwitch)
 
 --------------------------------

cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.cpp.REMOVED.git-id

@@ -1 +1 @@
-cb29285429f792ed191dc2135b5f80ca5e52e9d1
+28a6a3c5097941a6602ffedccf4d2a82f5b53389