adium/adium

Merged with rob-to86.
adium-1.6
2012-08-08, Thijs Alkemade
58b5c02fd64e
Merged with rob-to86.
--- a/ChangeLogs/Changes.txt Wed Aug 08 16:16:15 2012 +0200
+++ b/ChangeLogs/Changes.txt Wed Aug 08 16:18:05 2012 +0200
@@ -11,6 +11,7 @@
* Fixed a problem with emoticons scaling disproportionately in the yMous message style when using OS X 10.8.
* Improved memory use slightly.
+
Version 1.5.2 (7/21/2012)
* Fixed an issue where the log indexer would never finish.
* Fixed a number of crashes that could occur after closing the Transcript Viewer. (#15984, #15823)
--- a/Plists/Info.plist Wed Aug 08 16:16:15 2012 +0200
+++ b/Plists/Info.plist Wed Aug 08 16:18:05 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>