projects / platform / upstream / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c832878 5bfe131)
Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Jun 2011 21:46:42 +0000 (22:46 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 10 Jun 2011 21:46:42 +0000 (22:46 +0100)
Conflicts:
NEWS
configure.ac

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

diff --cc NEWS
Simple merge
Domain: System / IPC;