adium 4994:38ba68738994: Branching adium-1.5.3 into adium-1.5.4.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/38ba68738994
revision:	4994:38ba68738994
branch:		adium-1.5.4
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Aug 13 00:00:09 2012 +0200

Branching adium-1.5.3 into adium-1.5.4.

diffs (45 lines):

diff -r c9b03688370c -r 38ba68738994 Plists/Info.plist
--- a/Plists/Info.plist	Sun Aug 12 23:03:25 2012 +0200
+++ b/Plists/Info.plist	Mon Aug 13 00:00:09 2012 +0200
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.5.3, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.5.4b1, Copyright © 2001-2012 The Adium Team</string>
 	<key>CFBundleHelpBookFolder</key>
 	<string>AdiumHelp</string>
 	<key>CFBundleHelpBookName</key>
@@ -370,7 +370,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.3</string>
+	<string>1.5.4</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.3</string>
+	<string>1.5.4</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>
diff -r c9b03688370c -r 38ba68738994 Release/Makefile
--- a/Release/Makefile	Sun Aug 12 23:03:25 2012 +0200
+++ b/Release/Makefile	Mon Aug 13 00:00:09 2012 +0200
@@ -17,9 +17,9 @@
 # - make all
 ###########
 
-VERSION=1.5.3
+VERSION=1.5.4b1
 BUILD_IN_DEBUG_MODE?=FALSE
-BETA?=FALSE
+BETA?=YES
 OFFICIAL_BUILD?=TRUE
 
 # Always builds in debug mode.