]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
Merge remote-tracking branch 'wjt/arg0namespace' into arg0namespace-24317
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 11:40:30 +0000 (12:40 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 7 Apr 2011 11:40:30 +0000 (12:40 +0100)
1  2 
bus/signals.c
dbus/dbus-marshal-validate.c
dbus/dbus-marshal-validate.h
doc/dbus-specification.xml

diff --cc bus/signals.c
Simple merge
Simple merge
Simple merge
Simple merge