Merge pull request #6045 from CocosRobot/update_lua_bindings_1395994765

[AUTO]: updating luabinding automatically

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

@@ -94,11 +94,6 @@
 -- @param self
 -- @return FontDefinition#FontDefinition ret (return value: cc.FontDefinition)
         
---------------------------------
--- @function [parent=#Label] getBoundingBox 
--- @param self
--- @return rect_table#rect_table ret (return value: rect_table)
-        
 --------------------------------
 -- @function [parent=#Label] getFontName 
 -- @param self
@@ -343,6 +338,11 @@
 -- @param self
 -- @return size_table#size_table ret (return value: size_table)
         
+--------------------------------
+-- @function [parent=#Label] getBoundingBox 
+-- @param self
+-- @return rect_table#rect_table ret (return value: rect_table)
+        
 --------------------------------
 -- @function [parent=#Label] updateDisplayedColor 
 -- @param self

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

@@ -89,6 +89,11 @@
 -- @param #point_table point
 -- @return LabelBMFont#LabelBMFont ret (retunr value: cc.LabelBMFont)
 
+--------------------------------
+-- @function [parent=#LabelBMFont] getBoundingBox 
+-- @param self
+-- @return rect_table#rect_table ret (return value: rect_table)
+        
 --------------------------------
 -- @function [parent=#LabelBMFont] getDescription 
 -- @param self
@@ -105,6 +110,11 @@
 -- @param #int int
 -- @return Node#Node ret (return value: cc.Node)
         
+--------------------------------
+-- @function [parent=#LabelBMFont] getContentSize 
+-- @param self
+-- @return size_table#size_table ret (return value: size_table)
+        
 --------------------------------
 -- @function [parent=#LabelBMFont] LabelBMFont 
 -- @param self

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

@@ -163,11 +163,9 @@
 -- @return LabelTTF#LabelTTF ret (return value: cc.LabelTTF)
         
 --------------------------------
--- @function [parent=#LabelTTF] visit 
+-- @function [parent=#LabelTTF] getBoundingBox 
 -- @param self
--- @param #cc.Renderer renderer
--- @param #kmMat4 kmmat4
--- @param #bool bool
+-- @return rect_table#rect_table ret (return value: rect_table)
         
 --------------------------------
 -- @function [parent=#LabelTTF] getDescription 
@@ -179,6 +177,13 @@
 -- @param self
 -- @return size_table#size_table ret (return value: size_table)
         
+--------------------------------
+-- @function [parent=#LabelTTF] visit 
+-- @param self
+-- @param #cc.Renderer renderer
+-- @param #kmMat4 kmmat4
+-- @param #bool bool
+        
 --------------------------------
 -- @function [parent=#LabelTTF] LabelTTF 
 -- @param self

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

@@ -1 +1 @@
-7aff65efe54886d705b227ba45205bc6d4f8a650
+55307bad4398fdd7bedf9a96f00adb57cbaa7d2e

cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp

@@ -1561,7 +1561,6 @@ int register_all_cocos2dx(lua_State* tolua_S);
 
 
 
-
 
 
 #endif // __cocos2dx_h__