summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-01-13 11:20:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-01-13 11:20:47 (GMT)
commit17aaca4d226e48396437c512b6ea1873fc75b56c (patch)
tree2a22523717029923e79cb65801d4cbe163c58691 /Swift
parentf3bc816af1b0d61452de973963e453bf3b3f95a2 (diff)
parentbf6e16ca647c549fab4e6f6fc83ddc87d3ea9bc4 (diff)
downloadswift-17aaca4d226e48396437c512b6ea1873fc75b56c.zip
swift-17aaca4d226e48396437c512b6ea1873fc75b56c.tar.bz2
Merge branch 'swift-2.x'
* swift-2.x: Remove incorrect CFRelease() calls in MacOSXProxyProvider. Change-Id: Ia9fe8954839d65be9e337304ce095c7b48a64155
Diffstat (limited to 'Swift')
-rw-r--r--Swift/ChangeLog.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/Swift/ChangeLog.md b/Swift/ChangeLog.md
index 2fd9bf3..097de4d 100644
--- a/Swift/ChangeLog.md
+++ b/Swift/ChangeLog.md
@@ -3,6 +3,10 @@
- Allow toggling of a more compact roster display.
- Remember status settings and provide quick access to them with searching of recent selections in the status setter.
+2.1
+---
+- Fixed potential crash when using proxies on Mac OS X.
+
2.0-beta2
---------
- Enable auto-completion of nicknames that don't start with a letter.