projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f141c26 09d71f9)
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 15 Jun 2012 12:23:13 +0000 (13:23 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 15 Jun 2012 12:23:13 +0000 (13:23 +0100)
Conflicts:
NEWS
configure.ac

1  2 
NEWS patch | diff1 | diff2 | blob | history

diff --cc NEWS
index 320c78b,2a8f8ed..3dd3c2d
--- 1/NEWS
--- 2/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)
  ==
  
Domain: System / IPC;