adium 4967:80f05c1437cc: Adium 1.6 is still in development, the ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/80f05c1437cc
revision:	4967:80f05c1437cc
branch:		adium-1.6
author:		Robert Vehse
date:		Wed Aug 08 16:16:13 2012 +0200

Adium 1.6 is still in development, the version number should reflect that.

diffs (49 lines):

diff -r 2eac73592046 -r 80f05c1437cc ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sun Aug 05 22:46:04 2012 +0200
+++ b/ChangeLogs/Changes.txt	Wed Aug 08 16:16:13 2012 +0200
@@ -3,11 +3,14 @@
 Version 1.5.3 (XX/XX/XXXX)
  * Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)
  * Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)
+ * Fixed crash at startup that was meant to be fixed in 1.5.2. (#15787)
+ * Fixed a crash when receiving invalid XML on 10.8. (#16095)
  * Fixed an issue that caused logging in to Facebook to fail when login approvals are enabled. (#15705)
  * Icons set for group chat bookmarks will now show up on the tab bar in the chat window. (Andreas Marienborg) (#14484)
  * Fixed tables not being declared as such via VoiceOver. (Marco Zehe) (#16085)
+ * Fixed a problem with emoticons scaling disproportionately in the yMous message style when using OS X 10.8.
  * Improved memory use slightly.
- * Fixed a crash when receiving invalid XML on 10.8. (#16095)
+
 
 Version 1.5.2 (7/21/2012)
  * Fixed an issue where the log indexer would never finish.
diff -r 2eac73592046 -r 80f05c1437cc Plists/Info.plist
--- a/Plists/Info.plist	Sun Aug 05 22:46:04 2012 +0200
+++ b/Plists/Info.plist	Wed Aug 08 16:16:13 2012 +0200
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.6, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.6hg, 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.6</string>
+	<string>1.6hg</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.6</string>
+	<string>1.6hg</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>