]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
projects / thirdparty / dbus.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f96256 82a77d6)
Merge branch 'dbus-1.2'
authorWill Thompson <will.thompson@collabora.co.uk>
Fri, 21 May 2010 10:48:28 +0000 (11:48 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Fri, 21 May 2010 10:48:28 +0000 (11:48 +0100)
Conflicts:
bus/main.c
configure.in

1  2 
bus/main.c patch | diff1 | diff2 | blob | history

diff --cc bus/main.c
Simple merge
Mirror of https://gitlab.freedesktop.org/dbus/dbus.git