diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-18 14:04:30 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-18 14:04:30 +0000 |
| commit | 306f3175fb7facf4ce4e06cd96752e35ac5d0943 (patch) | |
| tree | 8d03505b34331c76bfb74225e886ee95af386ea5 | |
| parent | 583eb2a7e7db94033fc488caaefc819e4909c385 (diff) | |
| parent | 97143251db33faf3ffb968120f611240e3406841 (diff) | |
| download | telepathy-glib-306f3175fb7facf4ce4e06cd96752e35ac5d0943.tar.gz | |
Merge branch 'master' into next
Conflicts:
NEWS
tools/glib-client-gen.py
| -rw-r--r-- | NEWS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -54,6 +54,8 @@ Additions: Fixes: +• don't leak every D-Bus method call result, a regression in 0.23.1 (Simon) + • fix a memory leak when cleaning up TpProxy "prepare" requests (fd.o #76000, Simon) |