]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge branch 'dbus-1.6'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 23 Oct 2013 16:15:56 +0000 (17:15 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 23 Oct 2013 16:15:56 +0000 (17:15 +0100)
1  2 
bus/signals.c

diff --cc bus/signals.c
Simple merge