Merged adium-1.5.3 1.5.3
authorThijs Alkemade <thijsalkemade@gmail.com>
Sun, 12 Aug 2012 23:03:25 +0200
branchadium-1.5.3
changeset 4993c9b03688370c
parent 4992 47a40e2af47d
parent 4991 4152af398351
child 4994 38ba68738994
child 4996 b423dc1963a4
child 5225 18dead2e660f
Merged
     1.1 --- a/ChangeLogs/Changes.txt	Sun Aug 12 22:59:34 2012 +0200
     1.2 +++ b/ChangeLogs/Changes.txt	Sun Aug 12 23:03:25 2012 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  				Adium Version History
     1.5  				-----------------------
     1.6 -Version 1.5.3 (8/XX/2012)
     1.7 +Version 1.5.3 (8/12/2012)
     1.8   * Fixed another problem with the transcript viewer causing search to fail when closing and reopening the window. (#13586, #15699)
     1.9   * Fixed a problem with iTunes 10.6.3 on Mac OS X 10.6.8 causing the chat window's toolbar to break. (#16046)
    1.10   * Fixed crash at startup that was meant to be fixed in 1.5.2. (#15787)
     2.1 --- a/Plists/Info.plist	Sun Aug 12 22:59:34 2012 +0200
     2.2 +++ b/Plists/Info.plist	Sun Aug 12 23:03:25 2012 +0200
     2.3 @@ -354,7 +354,7 @@
     2.4  	<key>CFBundleExecutable</key>
     2.5  	<string>Adium</string>
     2.6  	<key>CFBundleGetInfoString</key>
     2.7 -	<string>1.5.3rc1, Copyright © 2001-2012 The Adium Team</string>
     2.8 +	<string>1.5.3, Copyright © 2001-2012 The Adium Team</string>
     2.9  	<key>CFBundleHelpBookFolder</key>
    2.10  	<string>AdiumHelp</string>
    2.11  	<key>CFBundleHelpBookName</key>
    2.12 @@ -370,7 +370,7 @@
    2.13  	<key>CFBundlePackageType</key>
    2.14  	<string>APPL</string>
    2.15  	<key>CFBundleShortVersionString</key>
    2.16 -	<string>1.5.3rc1</string>
    2.17 +	<string>1.5.3</string>
    2.18  	<key>CFBundleSignature</key>
    2.19  	<string>AdIM</string>
    2.20  	<key>CFBundleURLTypes</key>
    2.21 @@ -469,7 +469,7 @@
    2.22  		</dict>
    2.23  	</array>
    2.24  	<key>CFBundleVersion</key>
    2.25 -	<string>1.5.3rc1</string>
    2.26 +	<string>1.5.3</string>
    2.27  	<key>LSApplicationCategoryType</key>
    2.28  	<string>public.app-category.social-networking</string>
    2.29  	<key>LSFileQuarantineEnabled</key>
     3.1 Binary file Plugins/Twitter Plugin/twitter-small.png has changed
     4.1 Binary file Plugins/Twitter Plugin/twitter.png has changed
     5.1 --- a/Release/Makefile	Sun Aug 12 22:59:34 2012 +0200
     5.2 +++ b/Release/Makefile	Sun Aug 12 23:03:25 2012 +0200
     5.3 @@ -17,9 +17,9 @@
     5.4  # - make all
     5.5  ###########
     5.6  
     5.7 -VERSION=1.5.3rc1
     5.8 +VERSION=1.5.3
     5.9  BUILD_IN_DEBUG_MODE?=FALSE
    5.10 -BETA?=TRUE
    5.11 +BETA?=FALSE
    5.12  OFFICIAL_BUILD?=TRUE
    5.13  
    5.14  # Always builds in debug mode.