summaryrefslogtreecommitdiff
path: root/bus/bus.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-02-02 15:15:01 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-02-02 15:15:02 +0000
commita0e8ae3b77e5ec33e5661f82320cdef4466a9f9d (patch)
tree0de6ca446e732948a2c2bd5228a848acfee53e6a /bus/bus.c
parent9fee6d735ec674faab98379511257669f93b9ae7 (diff)
parentf7ecd2fb8b4f2bc9ed83b9b5ffc46566cefd6e31 (diff)
Merge branch 'dist-30285' into dbus-1.4
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Diffstat (limited to 'bus/bus.c')
0 files changed, 0 insertions, 0 deletions