Tue, 21 Mar 2017 23:23:37 +0100Move over doc updates from 1.5.11 branch. adium-1.5.10.3
Robert Vehse <robertvehse@fastmail.fm> [Tue, 21 Mar 2017 23:23:37 +0100] rev 5959
Move over doc updates from 1.5.11 branch.

Tue, 21 Mar 2017 21:26:27 +0100Updated the target to 10.7 and dropped i386 support. adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 21:26:27 +0100] rev 5958
Updated the target to 10.7 and dropped i386 support.

Tue, 21 Mar 2017 21:13:27 +0100Nuked MSN and Yahoo, which are known to not be working anymore. Good riddance. adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 21:13:27 +0100] rev 5957
Nuked MSN and Yahoo, which are known to not be working anymore. Good riddance.

Tue, 21 Mar 2017 21:09:53 +0100Replaced OpenSSL with Common Crypto for SHA1 in Bonjour. adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 21:09:53 +0100] rev 5956
Replaced OpenSSL with Common Crypto for SHA1 in Bonjour.

Fixes #17093

Tue, 21 Mar 2017 20:53:24 +0100Updated xcodeproj files to work with 7.2. adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 20:53:24 +0100] rev 5955
Updated xcodeproj files to work with 7.2.

Tue, 21 Mar 2017 20:51:18 +0100I have no idea what's up with this file, but it's missing in the newest build, so restoring the previous version. adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 20:51:18 +0100] rev 5954
I have no idea what's up with this file, but it's missing in the newest build, so restoring the previous version.

Tue, 21 Mar 2017 20:37:34 +0100libpurple 2.12.0 @ r11b8084bcff4 adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 20:37:34 +0100] rev 5953
libpurple 2.12.0 @ r11b8084bcff4

Tue, 21 Mar 2017 20:36:54 +0100For AIM, use the DevID and the distID supplied to us by an AOL representative in March 2017. Fixes #17097. adium-1.5.10.3
Robert Vehse <robertvehse@fastmail.fm> [Tue, 21 Mar 2017 20:36:54 +0100] rev 5952
For AIM, use the DevID and the distID supplied to us by an AOL representative in March 2017. Fixes #17097.

Tue, 21 Mar 2017 18:44:34 +0100Branched adium-1.5.10.3. adium-1.5.10.3
Thijs Alkemade <me@thijsalkema.de> [Tue, 21 Mar 2017 18:44:34 +0100] rev 5951
Branched adium-1.5.10.3.

Mon, 05 Sep 2016 00:05:53 +0200Merged matthewkotila/adium/tip into default default
Robbie <robertvehse@fastmail.fm> [Mon, 05 Sep 2016 00:05:53 +0200] rev 5950
Merged matthewkotila/adium/tip into default

Fixes #16970 ("Transition from SenTestingKit to XCTest") in order to build on OS X 10.11 / Xcode 7.2.

Mon, 14 Dec 2015 00:37:29 -0800Transition Adium from SenTestingKit to XCTest.
Matthew Kotila [Mon, 14 Dec 2015 00:37:29 -0800] rev 5949
Transition Adium from SenTestingKit to XCTest.

In order to build on OS X 10.11, Xcode 7.2, several changes have been made that are outlined:
- Unit tests Target Build Settings modified:
* 'Wrapper Extension' set to 'xctest'
* 'Enable Modules (C and Objective-C)' set to 'Yes'
- UnitTests Target of AutoHyperlink.framework Build Settings modified:
* 'Wrapper Extension' set to 'xctest'
* 'Enable Modules (C and Objective-C)' set to 'Yes'
* 'Other Linker Flags' removed '-framework SenTestingKit'
- 'SenTestingKit.framework' removed from Adium -> Linked Frameworks -> System
- 'SenTestingKit.framework' removed from Adium -> Linked Frameworks -> AutoHyperlinks.framework.xcodeproj -> External Frameworks and Libraries -> Linked Frameworks
- Find and Replace within 'Adium/Unit tests' && 'Adium/Linked Frameworks/Others/AutoHyperlinks.framework.xcodeproj/UnitTests'
* '<SenTestingKit/SenTestingKit.h>' to '<XCTest/XCTest.h>'
* 'SenTestCase' to 'XCTestCase'
* 'STAssert' to 'XCTAssert'
* 'XCTAssertEquals(' to 'XCTAssertEqual('
* regex '(\[\[\[)([^\]]*\][^\]]*\])(\ autorelease\]);' to '[[$2;'
* regex '(\[)([^\]]*\][^\]]*)(\ autorelease\])' to '$2'
- modified AutoHyperlinks.framework.xcodeproj -> project.pbxproj
* line 331: ?productType = "com.apple.product-type.bundle.ocunit-test";' to 'productType = "com.apple.product-type.bundle.unit-test";'
- AIWebKitMessageViewController.h
* forward declare WebUIDelegate, WebFrameLoadDelegate protocols
* add WebUIDelegate, WebFrameLoadDelegate protocols to 'AIWebKitMessageViewController' class
- AIFacebookXMPPOAuthWebViewWindowController.m lines 107 && 108
* '[[domDoc getElementById:@"email"] setValue:self.autoFillUsername];' to '[domDoc getElementById:@"email"].innerHTML = self.autoFillUsername;'
* '[[domDoc getElementById:@"pass"] setValue:self.autoFillPassword];' to '[domDoc getElementById:@"pass"].innerHTML = self.autoFillPassword;'
- XCTAssertEqual for NSRanges modified to ?XCTAssertTrue(NSEqualRanges(range1, range2)), ...)' in Unit tests

Sun, 04 Sep 2016 23:48:06 +0200Docs: Minor tweaks.
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 23:48:06 +0200] rev 5948
Docs: Minor tweaks.

Sun, 04 Sep 2016 23:48:06 +0200Docs:
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 23:48:06 +0200] rev 5947
Docs:
* Don't advertise services whose support is broken in Adium with no fix in sight.
* Instead, add a list of third-party protocol plugins.
* Minor tweaks.

Sun, 04 Sep 2016 23:30:19 +0200More MySpace removal. adium-1.6
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 23:30:19 +0200] rev 5946
More MySpace removal.

Sun, 04 Sep 2016 23:06:02 +0200Remove MySpace mentions from the project file. adium-1.6
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 23:06:02 +0200] rev 5945
Remove MySpace mentions from the project file.

Sun, 04 Sep 2016 22:54:53 +0200Remove MySpace protocol. adium-1.6
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 22:54:53 +0200] rev 5944
Remove MySpace protocol.

Sun, 04 Sep 2016 21:35:34 +0200Docs: Minor tweaks. adium-1.6
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 21:35:34 +0200] rev 5943
Docs: Minor tweaks.

Sun, 04 Sep 2016 21:35:34 +0200Docs: adium-1.6
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 21:35:34 +0200] rev 5942
Docs:
* Don't advertise services whose support is broken in Adium with no fix in sight.
* Instead, add a list of third-party protocol plugins.
* Minor tweaks.

Sun, 04 Sep 2016 21:31:36 +0200Docs: Minor tweaks. adium-1.5.11
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 21:31:36 +0200] rev 5941
Docs: Minor tweaks.

Sun, 04 Sep 2016 20:24:54 +0200Docs: adium-1.5.11
Robert Vehse <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 20:24:54 +0200] rev 5940
Docs:
* Don't advertise services whose support is broken in Adium with no fix in sight.
* Instead, add a list of third-party protocol plugins.
* Minor tweaks.

Sun, 04 Sep 2016 15:47:41 +0200Update README for latest version. Use Cachefly instead of Sourceforge like on the website's front page.
Robert Vehse [Sun, 04 Sep 2016 15:47:41 +0200] rev 5939
Update README for latest version. Use Cachefly instead of Sourceforge like on the website's front page.

Sun, 04 Sep 2016 13:12:17 +0000README.md edited online with Bitbucket
Robbie <robertvehse@fastmail.fm> [Sun, 04 Sep 2016 13:12:17 +0000] rev 5938
README.md edited online with Bitbucket

Sun, 04 Sep 2016 13:35:21 +0200Close adium-1.5.10.1. adium-1.5.10.1
Robert Vehse [Sun, 04 Sep 2016 13:35:21 +0200] rev 5937
Close adium-1.5.10.1.

Wed, 04 Dec 2013 17:43:08 +0100Close branch fix_idle fix_idle
Thijs Alkemade <t.p.alkemade@students.uu.nl> [Wed, 04 Dec 2013 17:43:08 +0100] rev 5936
Close branch fix_idle

Fri, 11 Mar 2016 07:41:18 +0100Merged 1.5.10.2 into 1.5.11. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Fri, 11 Mar 2016 07:41:18 +0100] rev 5935
Merged 1.5.10.2 into 1.5.11.

Wed, 09 Mar 2016 21:25:16 +0100Fix libjson-glib manually. adium-1.5.10.2
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 21:25:16 +0100] rev 5934
Fix libjson-glib manually.

Wed, 09 Mar 2016 21:07:01 +0100Fix version number in dynamic linking. adium-1.5.10.2
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 21:07:01 +0100] rev 5933
Fix version number in dynamic linking.

Wed, 09 Mar 2016 20:41:05 +0100Now actually added universal binaries of all dependencies. adium-1.5.10.2
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 20:41:05 +0100] rev 5932
Now actually added universal binaries of all dependencies.

Wed, 09 Mar 2016 19:26:44 +0100Remove cyclic import... I really don't know why this is necessary suddently. adium-1.5.10.2
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 19:26:44 +0100] rev 5931
Remove cyclic import... I really don't know why this is necessary suddently.

Wed, 09 Mar 2016 19:19:30 +0100Somehow, this GG file was missing. adium-1.5.10.2
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 19:19:30 +0100] rev 5930
Somehow, this GG file was missing.

Wed, 09 Mar 2016 19:06:59 +01001.5.10.2, emergency release for libotr bug CVE-2016-2851. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 19:06:59 +0100] rev 5929
1.5.10.2, emergency release for libotr bug CVE-2016-2851.

Wed, 09 Mar 2016 17:53:49 +0100libpurple @ 2.10.2, patched libotr. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Wed, 09 Mar 2016 17:53:49 +0100] rev 5928
libpurple @ 2.10.2, patched libotr.

Fri, 29 Jan 2016 21:07:42 +01001.5.10.1, emergency release for Sparkle vulnerability. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Fri, 29 Jan 2016 21:07:42 +0100] rev 5927
1.5.10.1, emergency release for Sparkle vulnerability.

Wed, 20 Jan 2016 10:13:00 +0100Also update this version number. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Wed, 20 Jan 2016 10:13:00 +0100] rev 5926
Also update this version number.

Wed, 20 Jan 2016 10:06:07 +0100Update version number to 1.5.10.1, as 1.5.11 is already in use. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Wed, 20 Jan 2016 10:06:07 +0100] rev 5925
Update version number to 1.5.10.1, as 1.5.11 is already in use.

Wed, 20 Jan 2016 10:04:51 +0100Updated Sparkle to 1.13.1. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Wed, 20 Jan 2016 10:04:51 +0100] rev 5924
Updated Sparkle to 1.13.1.

Wed, 20 Jan 2016 10:03:09 +0100Update the Sparkle feed URL to https again. adium-1.5.10.1
Thijs Alkemade <me@thijsalkema.de> [Wed, 20 Jan 2016 10:03:09 +0100] rev 5923
Update the Sparkle feed URL to https again.

Fri, 17 Apr 2015 19:39:46 +0200Remove the option to change the port for Google Talk. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Fri, 17 Apr 2015 19:39:46 +0200] rev 5922
Remove the option to change the port for Google Talk.

5222 is the correct port, and with the "Old style SSL" checkbox gone users could end up with a broken configuration.

Fixes #16893

Thu, 16 Apr 2015 19:13:24 +02001.5.11b2 adium-1.5.11 adium-1.5.11_bookmark
Thijs Alkemade <me@thijsalkema.de> [Thu, 16 Apr 2015 19:13:24 +0200] rev 5921
1.5.11b2

Wed, 08 Apr 2015 15:38:40 +0200Small changelog and documentation tweaks. adium-1.5.11
Robert Vehse <robertvehse@fastmail.fm> [Wed, 08 Apr 2015 15:38:40 +0200] rev 5920
Small changelog and documentation tweaks.

Thu, 02 Apr 2015 16:57:14 +0200Don't log things to the debug log that might contain access_tokens or refresh_tokens for the user, as they give (limited) access to their account. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Thu, 02 Apr 2015 16:57:14 +0200] rev 5919
Don't log things to the debug log that might contain access_tokens or refresh_tokens for the user, as they give (limited) access to their account.

Thu, 02 Apr 2015 08:32:02 +02001.5.11b1. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Thu, 02 Apr 2015 08:32:02 +0200] rev 5918
1.5.11b1.

Thu, 02 Apr 2015 08:29:17 +0200Merged GoogleOAuth2 into adium-1.5.11. Fixes #16161. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Thu, 02 Apr 2015 08:29:17 +0200] rev 5917
Merged GoogleOAuth2 into adium-1.5.11. Fixes #16161.

Thu, 02 Apr 2015 08:22:24 +0200More changelogging for 1.5.11. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Thu, 02 Apr 2015 08:22:24 +0200] rev 5916
More changelogging for 1.5.11.

Wed, 01 Apr 2015 21:12:13 +0200Merged GoogleOAuth2 into adium-1.6 again. adium-1.6
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 21:12:13 +0200] rev 5915
Merged GoogleOAuth2 into adium-1.6 again.

Wed, 01 Apr 2015 21:07:40 +0200Prompt the user to authenticate again when using the refresh_token gives an error. Also, show the error to the user. GoogleOAuth2 GoogleOAuth2_bookmark
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 21:07:40 +0200] rev 5914
Prompt the user to authenticate again when using the refresh_token gives an error. Also, show the error to the user.

Wed, 01 Apr 2015 20:32:24 +0200Merged GoogleOAuth2 into adium-1.6 adium-1.6 adium-1.6_bookmark
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 20:32:24 +0200] rev 5913
Merged GoogleOAuth2 into adium-1.6

Wed, 01 Apr 2015 20:30:40 +0200Make sure Adium automatically connects after the user has entered their code. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 20:30:40 +0200] rev 5912
Make sure Adium automatically connects after the user has entered their code.

Wed, 01 Apr 2015 19:41:18 +0200Changelogged. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 19:41:18 +0200] rev 5911
Changelogged.

Wed, 01 Apr 2015 19:30:25 +0200Added a localized version of the new nib for every localization, as the default is broken. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 19:30:25 +0200] rev 5910
Added a localized version of the new nib for every localization, as the default is broken.

Wed, 01 Apr 2015 16:42:18 +0200Suggestions by rob-to86: Make the code field larger and make the authorize button disappear when clicked. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 16:42:18 +0200] rev 5909
Suggestions by rob-to86: Make the code field larger and make the authorize button disappear when clicked.

Wed, 01 Apr 2015 16:04:15 +0200Explicitly ask the user to upgrade their account, so they know what's going in. Don't try to connect if retrieving the access_token failed. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 16:04:15 +0200] rev 5908
Explicitly ask the user to upgrade their account, so they know what's going in. Don't try to connect if retrieving the access_token failed.

Wed, 01 Apr 2015 15:29:11 +0200Don't use this function for base64 decoding, it is 10.9+ only GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 15:29:11 +0200] rev 5907
Don't use this function for base64 decoding, it is 10.9+ only

Wed, 01 Apr 2015 15:15:17 +0200Fix the base64 decoding, use the bare JID of the user. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 15:15:17 +0200] rev 5906
Fix the base64 decoding, use the bare JID of the user.

Wed, 01 Apr 2015 14:05:03 +0200Trying to deal with authentication failures by prompting the user again. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 14:05:03 +0200] rev 5905
Trying to deal with authentication failures by prompting the user again.

Wed, 01 Apr 2015 13:21:11 +0200Obtain the user's email automatically, and set that as the JID. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 13:21:11 +0200] rev 5904
Obtain the user's email automatically, and set that as the JID.

Wed, 01 Apr 2015 12:37:07 +0200Refresh tokens are now stored in the keychain and used on each connect. Moved some code to AIPurpleGTalkAccount, where it makes more sense. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 12:37:07 +0200] rev 5903
Refresh tokens are now stored in the keychain and used on each connect. Moved some code to AIPurpleGTalkAccount, where it makes more sense.

Wed, 01 Apr 2015 12:05:55 +0200Signing in works! But only for an hour, the refresh_token is unused. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 12:05:55 +0200] rev 5902
Signing in works! But only for an hour, the refresh_token is unused.

Wed, 01 Apr 2015 11:51:37 +0200access_token and refresh_token are now obtained. GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 11:51:37 +0200] rev 5901
access_token and refresh_token are now obtained.

Wed, 01 Apr 2015 10:49:48 +0200Started again to work on the X-OAUTH2 mechanism for Google Talk. Refs #16161 GoogleOAuth2
Thijs Alkemade <me@thijsalkema.de> [Wed, 01 Apr 2015 10:49:48 +0200] rev 5900
Started again to work on the X-OAUTH2 mechanism for Google Talk. Refs #16161

Will open the user's browser and prompt them to enter the code, but doesn't do anythign with it yet.

Wed, 14 Jan 2015 18:11:32 +0100Fix nonsense in README.md introduced by 0470e8f8186e. adium-1.5.11
Robert Vehse <robertvehse@fastmail.fm> [Wed, 14 Jan 2015 18:11:32 +0100] rev 5899
Fix nonsense in README.md introduced by 0470e8f8186e.

Thu, 25 Sep 2014 12:29:20 +1000Fixed double release causing crash upon file transfer completion on Bonjour. Fixes #16038, references #16182. adium-1.5.11
Quentin Les <quentmail-spam@yahoo.fr> [Thu, 25 Sep 2014 12:29:20 +1000] rev 5898
Fixed double release causing crash upon file transfer completion on Bonjour. Fixes #16038, references #16182.

Wed, 14 Jan 2015 15:54:44 +0100AdiumHelp: fix the link for creating an AIM account. adium-1.5.11
Robert Vehse <robertvehse@fastmail.fm> [Wed, 14 Jan 2015 15:54:44 +0100] rev 5897
AdiumHelp: fix the link for creating an AIM account.

Tue, 16 Dec 2014 13:32:57 +0100Merged adium-1.5.11 into adium-1.6. adium-1.6
Thijs Alkemade <me@thijsalkema.de> [Tue, 16 Dec 2014 13:32:57 +0100] rev 5896
Merged adium-1.5.11 into adium-1.6.

Tue, 16 Dec 2014 13:26:16 +0100Adding +[NSString randomString] seems to be popular, it appears to be colliding with some plugin I have loaded. Add a prefix here. adium-1.5.11
Thijs Alkemade <me@thijsalkema.de> [Tue, 16 Dec 2014 13:26:16 +0100] rev 5895
Adding +[NSString randomString] seems to be popular, it appears to be colliding with some plugin I have loaded. Add a prefix here.

Fri, 07 Nov 2014 09:24:06 -0600Workaround for Yahoo's https server closing the connection without sending close_notify first. Thanks to reanimus for the patch. Fixes #16678. r=kbotc adium-1.5.11
mathuaerknedam <adium@ei8ht.us> [Fri, 07 Nov 2014 09:24:06 -0600] rev 5894
Workaround for Yahoo's https server closing the connection without sending close_notify first. Thanks to reanimus for the patch. Fixes #16678. r=kbotc

Mon, 04 Aug 2014 16:49:27 -0400Use the sharedApplication delegate instead of NSApp's delegate. Fixes #16795
Frank Dowsett <wixardy@adium.im> [Mon, 04 Aug 2014 16:49:27 -0400] rev 5893
Use the sharedApplication delegate instead of NSApp's delegate. Fixes #16795

Sat, 26 Jul 2014 10:07:55 -0400Remove some extra whitespace in two labels. Fixes #16803 adium-1.5.11
Frank Dowsett <wixardy@adium.im> [Sat, 26 Jul 2014 10:07:55 -0400] rev 5892
Remove some extra whitespace in two labels. Fixes #16803

Wed, 23 Jul 2014 12:53:45 +0200Fixed "preferneces" typo. adium-1.5.11
Robert Vehse <robertvehse@fastmail.fm> [Wed, 23 Jul 2014 12:53:45 +0200] rev 5891
Fixed "preferneces" typo.

In the British English localisation, a) corrected a bunch of "-ize" and "-ization" to "-ise"/"-isation", b) fixed spelling of "licence" (noun) and c) fixed spelling of "behaviour" in many places. Fixes #16802.

Sun, 20 Jul 2014 23:10:26 -0400merge adium-1.6 into default
Frank Dowsett <wixardy@adium.im> [Sun, 20 Jul 2014 23:10:26 -0400] rev 5890
merge adium-1.6 into default

Sun, 20 Jul 2014 13:29:20 -0400merge adium-1.6 into default
Frank Dowsett <wixardy@adium.im> [Sun, 20 Jul 2014 13:29:20 -0400] rev 5889
merge adium-1.6 into default

Sun, 20 Jul 2014 23:06:22 -0400Undo this (probably Xcode 6) auto-change and fix the build. adium-1.6
Frank Dowsett <wixardy@adium.im> [Sun, 20 Jul 2014 23:06:22 -0400] rev 5888
Undo this (probably Xcode 6) auto-change and fix the build.

Sun, 20 Jul 2014 21:55:57 +0200Made sure all the XIBs modified in the previous commit can still be opened using Xcode 4.6. adium-1.6
Robert Vehse <robertvehse@fastmail.fm> [Sun, 20 Jul 2014 21:55:57 +0200] rev 5887
Made sure all the XIBs modified in the previous commit can still be opened using Xcode 4.6.

Sun, 20 Jul 2014 12:34:10 -0400Move the contact list view options from the "View" menu into the "Contact List" preference pane. Fixes #16509 adium-1.6
Frank Dowsett <wixardy@adium.im> [Sun, 20 Jul 2014 12:34:10 -0400] rev 5886
Move the contact list view options from the "View" menu into the "Contact List" preference pane. Fixes #16509

The "Display" menu is now part of the "View" menu. Refs #15203

Sat, 19 Jul 2014 19:55:43 -0400Whoops missed the upside down user icons. adium-1.6
Frank Dowsett <wixardy@adium.im> [Sat, 19 Jul 2014 19:55:43 -0400] rev 5885
Whoops missed the upside down user icons.