adium 5228:c4aef8108821: Branching for adium-1.5.5, if we ever d...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/c4aef8108821
revision:	5228:c4aef8108821
branch:		adium-1.5.5
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Sat Nov 10 12:56:31 2012 +0100

Branching for adium-1.5.5, if we ever do it.

diffs (46 lines):

diff -r 54b8a3666e1e -r c4aef8108821 Plists/Info.plist
--- a/Plists/Info.plist	Sat Nov 10 12:53:10 2012 +0100
+++ b/Plists/Info.plist	Sat Nov 10 12:56:31 2012 +0100
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.5.4, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.5.5b1, 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.4</string>
+	<string>1.5.5b1</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.4</string>
+	<string>1.5.5b1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>
diff -r 54b8a3666e1e -r c4aef8108821 Release/Makefile
--- a/Release/Makefile	Sat Nov 10 12:53:10 2012 +0100
+++ b/Release/Makefile	Sat Nov 10 12:56:31 2012 +0100
@@ -17,9 +17,9 @@
 # - make all
 ###########
 
-VERSION=1.5.4
-BUILD_IN_DEBUG_MODE?=FALSE
-BETA?=FALSE
+VERSION=1.5.5b1
+BUILD_IN_DEBUG_MODE?=TRUE
+BETA?=TRUE
 OFFICIAL_BUILD?=TRUE
 
 # Always builds in debug mode.