adium/adium

Merge stray adium-1.5.11.
adium-1.5.11
2014-07-01, Frank Dowsett
4d093f0a397a
Parents 5a62e233115d0470e8f8186e
Children 91943bd7083f
Merge stray adium-1.5.11.
2 files changed, 5 insertions(+), 3 deletions(-)
  • +1 -1
    ChangeLogs/Changes.txt
  • +4 -2
    README.md
    • --- a/ChangeLogs/Changes.txt Tue Jun 03 21:11:02 2014 +0200
    +++ b/ChangeLogs/Changes.txt Tue Jul 01 17:01:49 2014 -0400
    @@ -2,7 +2,7 @@
    Adium Version History
    -----------------------
    -Version 1.5.10 (05/16/2014)
    +Version 1.5.10 (05/19/2014)
    * Updated libpurple to 2.10.9, fixing many security issues.
    * Updated the PSMTabBarControl framework, used in Adium for tabs:
    * Fixed an issue which occurred when dragging a conversation window into an existing tabbed conversation window and which caused Adium to become unresponsive. (#16281)
    --- a/README.md Tue Jun 03 21:11:02 2014 +0200
    +++ b/README.md Tue Jul 01 17:01:49 2014 -0400
    @@ -1,9 +1,11 @@
    [Adium](https://adium.im)
    ========================
    -[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
    +-[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
    ++[![Adiumy](https://adium.im/images/logo.png)](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)
    -[Download Adium 1.5.9](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
    +-[Download Adium 1.5.9](https://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download?accel_key=67%3A1386175847%3Ahttps%253A//adium.im/%3A64fc072b%242796f9fa06c20c320881147a26394ee76682951e&click_id=399ffab8-5d04-11e3-b3d1-0200ac1d1d96-1&source=accel)
    ++[Download Adium 1.5.10](https://sourceforge.net/projects/adium/files/Adium_1.5.10.dmg/download?accel_key=67%3A1400803646%3Ahttps%253A//adium.im/%3A5c8289c7%2445aedffbd5670cadf988490fc5ac9588a4a1621e&click_id=38f81be2-e20e-11e3-8070-0200ac1d1d8c-1&source=accel)
    ## About Adium ##