Merged adium-1.5.3 into adium-1.6. adium-1.6
authorThijs Alkemade <thijsalkemade@gmail.com>
Mon, 13 Aug 2012 00:14:14 +0200
branchadium-1.6
changeset 4996 b423dc1963a4
parent 4990 c346a138fd5a (current diff)
parent 4993 c9b03688370c (diff)
child 4997 072a38e0a9bc
child 5002 a6e84077187b
Merged adium-1.5.3 into adium-1.6.
ChangeLogs/Changes.txt
Plists/Info.plist
Release/Makefile
Source/AILoggerPlugin.m
--- a/ChangeLogs/Changes.txt	Fri Aug 10 19:41:33 2012 +0200
+++ b/ChangeLogs/Changes.txt	Mon Aug 13 00:14:14 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)
Binary file Plugins/Twitter Plugin/twitter-small.png has changed
Binary file Plugins/Twitter Plugin/twitter.png has changed
--- a/Release/Makefile	Fri Aug 10 19:41:33 2012 +0200
+++ b/Release/Makefile	Mon Aug 13 00:14:14 2012 +0200
@@ -17,7 +17,7 @@
 # - make all
 ###########
 
-VERSION=1.6
+VERSION=1.6hg
 BUILD_IN_DEBUG_MODE?=FALSE
 BETA?=TRUE
 OFFICIAL_BUILD?=TRUE
--- a/Source/AILoggerPlugin.m	Fri Aug 10 19:41:33 2012 +0200
+++ b/Source/AILoggerPlugin.m	Mon Aug 13 00:14:14 2012 +0200
@@ -64,7 +64,7 @@
 #define KEY_LOG_INDEX_VERSION		@"Log Index Version"
 
 //Version of the log index.  Increase this number to reset everyone's index.
-#define	CURRENT_LOG_VERSION			9
+#define	CURRENT_LOG_VERSION			10
 #define LOG_INDEX_STATUS_INTERVAL   20
 #define LOG_CLEAN_SAVE_INTERVAL     2000
 #define NEW_LOGFILE_TIMEOUT         600