From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 15 Jun 2012 12:23:13 +0000 (+0100)
Subject: Merge branch 'dbus-1.6'
X-Git-Tag: dbus-1.7.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=085cabfbf4262087aaaa2cf3a567c9aaa0aec282;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.6'

Conflicts:
	NEWS
	configure.ac
---

085cabfbf4262087aaaa2cf3a567c9aaa0aec282
diff --cc NEWS
index 320c78bf8,2a8f8ed08..3dd3c2d21
--- a/NEWS
+++ b/NEWS
@@@ -1,6 -1,12 +1,12 @@@
 -D-Bus 1.6.2 (UNRELEASED)
 +D-Bus 1.7.0 (UNRELEASED)
  ==
  
+ Fixes:
+ 
+ • Add dbus-launch --exit-with-x11 option. Distributions should use this
+   in their X11 session startup infrastructure, in preference to
+   the --exit-with-session option. (fd.o #39197, Simon McVittie)
+ 
  D-Bus 1.6.0 (2012-06-05)
  ==