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 4993 c9b03688370c
parent 4992 47a40e2af47d (current diff)
parent 4991 4152af398351 (diff)
child 4994 38ba68738994
child 4996 b423dc1963a4
child 5225 18dead2e660f
Merged
--- a/ChangeLogs/Changes.txt	Sun Aug 12 22:59:34 2012 +0200
+++ b/ChangeLogs/Changes.txt	Sun Aug 12 23:03:25 2012 +0200
@@ -1,6 +1,6 @@
 				Adium Version History
 				-----------------------
-Version 1.5.3 (8/XX/2012)
+Version 1.5.3 (8/12/2012)
  * 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)
--- a/Plists/Info.plist	Sun Aug 12 22:59:34 2012 +0200
+++ b/Plists/Info.plist	Sun Aug 12 23:03:25 2012 +0200
@@ -354,7 +354,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Adium</string>
 	<key>CFBundleGetInfoString</key>
-	<string>1.5.3rc1, Copyright © 2001-2012 The Adium Team</string>
+	<string>1.5.3, 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.3rc1</string>
+	<string>1.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>AdIM</string>
 	<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.5.3rc1</string>
+	<string>1.5.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSFileQuarantineEnabled</key>
Binary file Plugins/Twitter Plugin/twitter-small.png has changed
Binary file Plugins/Twitter Plugin/twitter.png has changed
--- a/Release/Makefile	Sun Aug 12 22:59:34 2012 +0200
+++ b/Release/Makefile	Sun Aug 12 23:03:25 2012 +0200
@@ -17,9 +17,9 @@
 # - make all
 ###########
 
-VERSION=1.5.3rc1
+VERSION=1.5.3
 BUILD_IN_DEBUG_MODE?=FALSE
-BETA?=TRUE
+BETA?=FALSE
 OFFICIAL_BUILD?=TRUE
 
 # Always builds in debug mode.