Merge pull request #6017 from CocosRobot/update_lua_bindings_1395899624

[AUTO]: updating luabinding automatically

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

@@ -53,6 +53,11 @@
 -- @param self
 -- @param #kmMat4 kmmat4
 
+--------------------------------
+-- @function [parent=#GLProgram] getMaterialProgramID 
+-- @param self
+-- @return unsigned int#unsigned int ret (return value: unsigned int)
+        
 --------------------------------
 -- @function [parent=#GLProgram] setUniformLocationWith3i 
 -- @param self

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

@@ -1 +1 @@
-2b4d7967b19a02138c89b1c3ed7fc4682267a47a
+3bcfacd1a43c62b8fb2af30248a05444f00a8027

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

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