adium 5369:f1c3dd536747: There are two different builds floating...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/f1c3dd536747
revision:	5369:f1c3dd536747
branch:		adium-1.5.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Mon Mar 04 21:51:21 2013 +0100

There are two different builds floating around now that were "1.5.5". Lets not make that worse by adding one more, but lets do a beta for 1.5.6.
Subject: adium 5370:79c44052280a: Changelog the problems that plagued 1.5.5 and are now fixed.

details:	http://hg.adium.im/adium/rev/79c44052280a
revision:	5370:79c44052280a
branch:		adium-1.5.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Mon Mar 04 21:53:45 2013 +0100

Changelog the problems that plagued 1.5.5 and are now fixed.

diffs (59 lines):

diff -r c71cfe104f07 -r 79c44052280a ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Fri Mar 01 23:04:26 2013 +0100
+++ b/ChangeLogs/Changes.txt	Mon Mar 04 21:53:45 2013 +0100
@@ -1,5 +1,9 @@
 				Adium Version History
 				-----------------------
+Version 1.5.6 (3/XX/2013)
+ * Fix a crash on startup on 10.6.8.
+ * Fix a crash when accepting or canceling the certificate verification dialog. (#16280)
+
 Version 1.5.5 (2/24/2013)
  * Updated libpurple to 2.10.7 fixing two security vulnerabilities.
  * Fixed "Add Link..." when the cursor is at the end of the line. (#16200)
diff -r c71cfe104f07 -r 79c44052280a Plists/Info.plist
--- a/Plists/Info.plist	Fri Mar 01 23:04:26 2013 +0100
+++ b/Plists/Info.plist	Mon Mar 04 21:53:45 2013 +0100
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.5.5, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.5.6b1, 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.5</string>
+	<string>1.5.6b1</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.5</string>
+	<string>1.5.6b1</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>
diff -r c71cfe104f07 -r 79c44052280a Release/Makefile
--- a/Release/Makefile	Fri Mar 01 23:04:26 2013 +0100
+++ b/Release/Makefile	Mon Mar 04 21:53:45 2013 +0100
@@ -17,9 +17,9 @@
 # - make all
 ###########
 
-VERSION=1.5.5
-BUILD_IN_DEBUG_MODE?=FALSE
-BETA?=FALSE
+VERSION=1.5.6b1
+BUILD_IN_DEBUG_MODE?=TRUE
+BETA?=TRUE
 OFFICIAL_BUILD?=TRUE
 
 # Always builds in debug mode.