Merge pull request #5692 from CocosRobot/update_lua_bindings_1394594250

[AUTO]: updating luabinding automatically

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

@@ -0,0 +1,94 @@
+--------------------------------
+-- @module ccui
+
+--------------------------------------------------------
+-- the ccui LayoutParameter
+-- @field [parent=#ccui] LayoutParameter#LayoutParameter LayoutParameter preloaded module
+
+
+--------------------------------------------------------
+-- the ccui LinearLayoutParameter
+-- @field [parent=#ccui] LinearLayoutParameter#LinearLayoutParameter LinearLayoutParameter preloaded module
+
+
+--------------------------------------------------------
+-- the ccui RelativeLayoutParameter
+-- @field [parent=#ccui] RelativeLayoutParameter#RelativeLayoutParameter RelativeLayoutParameter preloaded module
+
+
+--------------------------------------------------------
+-- the ccui Widget
+-- @field [parent=#ccui] Widget#Widget Widget preloaded module
+
+
+--------------------------------------------------------
+-- the ccui Layout
+-- @field [parent=#ccui] Layout#Layout Layout preloaded module
+
+
+--------------------------------------------------------
+-- the ccui Button
+-- @field [parent=#ccui] Button#Button Button preloaded module
+
+
+--------------------------------------------------------
+-- the ccui CheckBox
+-- @field [parent=#ccui] CheckBox#CheckBox CheckBox preloaded module
+
+
+--------------------------------------------------------
+-- the ccui ImageView
+-- @field [parent=#ccui] ImageView#ImageView ImageView preloaded module
+
+
+--------------------------------------------------------
+-- the ccui Text
+-- @field [parent=#ccui] Text#Text Text preloaded module
+
+
+--------------------------------------------------------
+-- the ccui TextAtlas
+-- @field [parent=#ccui] TextAtlas#TextAtlas TextAtlas preloaded module
+
+
+--------------------------------------------------------
+-- the ccui LoadingBar
+-- @field [parent=#ccui] LoadingBar#LoadingBar LoadingBar preloaded module
+
+
+--------------------------------------------------------
+-- the ccui ScrollView
+-- @field [parent=#ccui] ScrollView#ScrollView ScrollView preloaded module
+
+
+--------------------------------------------------------
+-- the ccui ListView
+-- @field [parent=#ccui] ListView#ListView ListView preloaded module
+
+
+--------------------------------------------------------
+-- the ccui Slider
+-- @field [parent=#ccui] Slider#Slider Slider preloaded module
+
+
+--------------------------------------------------------
+-- the ccui TextField
+-- @field [parent=#ccui] TextField#TextField TextField preloaded module
+
+
+--------------------------------------------------------
+-- the ccui TextBMFont
+-- @field [parent=#ccui] TextBMFont#TextBMFont TextBMFont preloaded module
+
+
+--------------------------------------------------------
+-- the ccui PageView
+-- @field [parent=#ccui] PageView#PageView PageView preloaded module
+
+
+--------------------------------------------------------
+-- the ccui Helper
+-- @field [parent=#ccui] Helper#Helper Helper preloaded module
+
+
+return nil

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

@@ -1 +1 @@
-7ce0f269261b418b148cd10d428bafe18a36d58e
+c9cf8f3050b95aec88a2452e60fe492252ad30c3