Preparing release 2.1.0 Beta 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 8f7a25d61d0a427baf2675da6f341f25745c1771..f2ca76e645de3445c5bf3c7dc35c6d93293d7d31 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 Beta 1</version> <!-- codename: typhoon -->
-               <date>2014-12-14</date>
+               <version>2.1.0 Beta 2</version> <!-- codename: typhoon -->
+               <date>2014-12-18</date>
        </packageinformation>
        
        <authorinformation>
@@ -87,5 +87,15 @@
                
                <instruction type="script" run="standalone">acp/update_mqc_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
-        -->
+       -->
+       
+       <instructions type="update" fromversion="2.1.0 Beta 1">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               
+               <instruction type="language" run="standalone">language/*.xml</instruction>
+               
+               <instruction type="option">option.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 22bd62fa1403a016d885a5bcd0616ee8aa13b9a0..d4a96db086a72b1e783386e5dd77f81df4200cc6 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -37,7 +37,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.0 Beta 1 (Typhoon)');
+define('WCF_VERSION', '2.1.0 Beta 2 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());