From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 18 Dec 2014 17:23:31 +0000 (+0100)
Subject: Preparing release 2.1.0 Beta 2
X-Git-Tag: 2.1.0_Beta_2^0
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=12bd3450229e770aa17c7cb5ab8a2aa1041e8ee8;p=GitHub%2FWoltLab%2FWCF.git

Preparing release 2.1.0 Beta 2
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 8f7a25d61d..f2ca76e645 100644
--- 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 22bd62fa14..d4a96db086 100644
--- 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());