adium 4930:602d38d8ca54: This is now the adium-1.6 branch. Branc...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/602d38d8ca54
revision:	4930:602d38d8ca54
branch:		adium-1.6
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Fri Jul 27 15:00:17 2012 +0200

This is now the adium-1.6 branch. Branching from this point as the consensus seems to be to maintain 10.6 compatibility for 1.6.

diffs (42 lines):

diff -r 95e6b347f547 -r 602d38d8ca54 Plists/Info.plist
--- a/Plists/Info.plist	Wed Jul 25 01:48:15 2012 +0200
+++ b/Plists/Info.plist	Fri Jul 27 15:00:17 2012 +0200
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.6hg, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.6, 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.6hg</string>
+	<string>1.6</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.6hg</string>
+	<string>1.6</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>
diff -r 95e6b347f547 -r 602d38d8ca54 Release/Makefile
--- a/Release/Makefile	Wed Jul 25 01:48:15 2012 +0200
+++ b/Release/Makefile	Fri Jul 27 15:00:17 2012 +0200
@@ -17,7 +17,7 @@
 # - make all
 ###########
 
-VERSION=1.6hg
+VERSION=1.6
 BUILD_IN_DEBUG_MODE?=FALSE
 BETA?=TRUE
 OFFICIAL_BUILD?=TRUE