merge from branch luminous (version 1.5.4.2, ~r12561)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions

View file

@ -4,7 +4,7 @@
</tables>
<columns>
<column name="site_srl" var="site_srl" notnull="notnull" />
<column name="layout_Srl" var="layout_srl" notnull="notnull" default="0" />
<column name="layout_srl" var="layout_srl" notnull="notnull" default="0" />
</columns>
<conditions>
<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />