Preparing internal release 2.1.1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 77f8ab8495ba7bc1b94f1751f93ba7e2a77218e1..dc2a6de1a1c20cf61bcc2ca02d2d873c6996f5dd 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.1.0</version> <!-- codename: typhoon -->
-               <date>2015-03-01</date>
+               <version>2.1.1</version> <!-- codename: typhoon -->
+               <date>2015-03-03</date>
        </packageinformation>
        
        <authorinformation>
@@ -136,15 +136,10 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.0 RC 2">
+       <instructions type="update" fromversion="2.1.0">
                <instruction type="file" run="standalone">files_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                
                <instruction type="language" run="standalone">language/*.xml</instruction>
-               
-               <instruction type="bbcode">bbcode.xml</instruction>
-               <instruction type="coreObject">coreObject.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               <instruction type="userGroupOption">userGroupOption.xml</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 53b448b22f12aa5d6384c6476047e05391c16a92..2237973399d5036d4c9b17b622ab06f209d38570 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.0 (Typhoon)');
+define('WCF_VERSION', '2.1.1 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());