Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14655 from CocosRobot/update_lua_bindings_1449976044 

[ci skip][AUTO]: updating luabinding & jsbinding automatically
This commit is contained in:
pandamicro 2015-12-13 11:12:35 +08:00
parent a80ca25d63 0473dd88fc
commit 1935e2a89b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/lua-bindings/auto/api/Control.lua
View File

@ -75,7 +75,7 @@
-- @return Control#Control self (return value: cc.Control)
--------------------------------
-- Returns a point corresponding to the touh location converted into the<br>
-- Returns a point corresponding to the touch location converted into the<br>
-- control space coordinates.<br>
-- param touch A Touch object that represents a touch.
-- @function [parent=#Control] getTouchLocation

2
cocos/scripting/lua-bindings/auto/api/ControlButton.lua
View File

@ -145,7 +145,7 @@
-- @return bool#bool ret (return value: bool)
--------------------------------
-- Sets the font of the label, changes the label to a BMFont if neccessary.<br>
-- Sets the font of the label, changes the label to a BMFont if necessary.<br>
-- param fntFile The name of the font to change to<br>
-- param state The state that uses the specified fntFile. The values are described<br>
-- in "CCControlState".