Merge branch 'dbus-1.8'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 21 Jul 2015 16:20:11 +0000 (17:20 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 21 Jul 2015 16:20:11 +0000 (17:20 +0100)
Conflicts:
.gitignore
NEWS
tools/dbus-monitor.c

1  2 
NEWS

diff --cc NEWS
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -32,15 -6,13 +32,18 @@@ Fixes
  • Fix a memory leak when GetConnectionCredentials() succeeds
    (fd.o #91008, Jacek Bukarewicz)
  
 -D-Bus 1.8.18 (2015-05-14)
+ • Ensure that dbus-monitor does not reply to messages intended for others
+   (fd.o #90952, Simon McVittie)
 +D-Bus 1.9.16 (2015-05-14)
  ==
  
 -The “unicorn rifts” release.
 +The “titanium barns” release.
 +
 +Dependencies:
 +
 +• Automake 1.13 is now required when compiling from git or modifying
 +  the build system.
  
  Security hardening: