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 4996b423dc1963a4
parent 4990 c346a138fd5a
parent 4993 c9b03688370c
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
     1.1 --- a/ChangeLogs/Changes.txt	Fri Aug 10 19:41:33 2012 +0200
     1.2 +++ b/ChangeLogs/Changes.txt	Mon Aug 13 00:14:14 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 Binary file Plugins/Twitter Plugin/twitter-small.png has changed
     3.1 Binary file Plugins/Twitter Plugin/twitter.png has changed
     4.1 --- a/Release/Makefile	Fri Aug 10 19:41:33 2012 +0200
     4.2 +++ b/Release/Makefile	Mon Aug 13 00:14:14 2012 +0200
     4.3 @@ -17,7 +17,7 @@
     4.4  # - make all
     4.5  ###########
     4.6  
     4.7 -VERSION=1.6
     4.8 +VERSION=1.6hg
     4.9  BUILD_IN_DEBUG_MODE?=FALSE
    4.10  BETA?=TRUE
    4.11  OFFICIAL_BUILD?=TRUE
     5.1 --- a/Source/AILoggerPlugin.m	Fri Aug 10 19:41:33 2012 +0200
     5.2 +++ b/Source/AILoggerPlugin.m	Mon Aug 13 00:14:14 2012 +0200
     5.3 @@ -64,7 +64,7 @@
     5.4  #define KEY_LOG_INDEX_VERSION		@"Log Index Version"
     5.5  
     5.6  //Version of the log index.  Increase this number to reset everyone's index.
     5.7 -#define	CURRENT_LOG_VERSION			9
     5.8 +#define	CURRENT_LOG_VERSION			10
     5.9  #define LOG_INDEX_STATUS_INTERVAL   20
    5.10  #define LOG_CLEAN_SAVE_INTERVAL     2000
    5.11  #define NEW_LOGFILE_TIMEOUT         600