mirror of https://github.com/axmolengine/axmol.git
Merge pull request #6086 from CocosRobot/update_lua_bindings_1396323111
[AUTO]: updating luabinding automatically
This commit is contained in:
commit
fb9c94f692
|
@ -53,11 +53,6 @@
|
||||||
-- @param self
|
-- @param self
|
||||||
-- @param #kmMat4 kmmat4
|
-- @param #kmMat4 kmmat4
|
||||||
|
|
||||||
--------------------------------
|
|
||||||
-- @function [parent=#GLProgram] getMaterialProgramID
|
|
||||||
-- @param self
|
|
||||||
-- @return unsigned int#unsigned int ret (return value: unsigned int)
|
|
||||||
|
|
||||||
--------------------------------
|
--------------------------------
|
||||||
-- @function [parent=#GLProgram] setUniformLocationWith3i
|
-- @function [parent=#GLProgram] setUniformLocationWith3i
|
||||||
-- @param self
|
-- @param self
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
ff3f22e8f1e3ebfc8f908ea0a9d6cb9d0b06ba54
|
1c4f4b76cfb3185992854e0baf0811b662c36dd7
|
|
@ -1557,7 +1557,6 @@ int register_all_cocos2dx(lua_State* tolua_S);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // __cocos2dx_h__
|
#endif // __cocos2dx_h__
|
||||||
|
|
Loading…
Reference in New Issue