]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.4', rejecting commit 08dd53c14b53b88c
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 23 Jan 2012 10:33:35 +0000 (10:33 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 23 Jan 2012 10:33:35 +0000 (10:33 +0000)
1  2 
NEWS
bus/bus.c

diff --cc NEWS
index c1aa631869ccea19023455a8bd78a6bfed534dc6,7703661cc05dd00a4edaa0f6a5aa47b954a76410..3aae0a123aa06d35af3ca8459bfc6b1e9c938465
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,6 -1,9 +1,9 @@@
 -D-Bus 1.4.18 (UNRELEASED)
 +D-Bus 1.5.10 (UNRELEASED)
  ==
  
+ • Allow all configured auth mechanisms, not just one (fd.o #45106,
+   Pavel Strashkin)
  • Improve cmake build system (Ralf Habacker):
    · simplify XML parser dependencies (fd.o #41027)
    · generate build timestamp (fd.o #41029)
diff --cc bus/bus.c
Simple merge