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

@ -14,7 +14,7 @@
* Display XE's full version
* Even The file should be revised when releasing altough no change is made
*/
define('__XE_VERSION__', '1.5.3.3');
define('__XE_VERSION__', '1.5.4.2');
/**
* @deprecated __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.