merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -7,6 +7,7 @@
<column name="module_category_srl" var="module_category_srl" />
<column name="layout_srl" var="layout_srl" />
<column name="skin" var="skin" minlength="0" maxlength="250" />
<column name="is_skin_fix" var="is_skin_fix" default="Y" />
<column name="mskin" var="mskin" />
<column name="menu_srl" var="menu_srl" filter="number" />
<column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />