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

Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

This commit is contained in:
samuele3hu 2014-04-01 11:49:06 +08:00
parent 130c2608da fb9c94f692
commit 8af92fd574
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/scripting/lua-bindings/auto/api/GLProgram.lua
View File

@ -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

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

@ -1 +1 @@
ff3f22e8f1e3ebfc8f908ea0a9d6cb9d0b06ba54 1c4f4b76cfb3185992854e0baf0811b662c36dd7

1
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

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