summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-08-13 20:13:27 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-08-13 20:14:16 +0100
commitd353e73d35f4de18dc075579208fa4928553ad1b (patch)
treef41cc515f26fc57929a942b86fe028b6cbfc4bc3
parent1dd0ff6d5bc95516d26bd1dff6dd97599ac60e2e (diff)
parentdddedfa27db3afab96cba443d07ee81594817a01 (diff)
downloaddbus-d353e73d35f4de18dc075579208fa4928553ad1b.tar.gz
Merge branch 'dbus-1.6', rejecting reversion of #38201
0 files changed, 0 insertions, 0 deletions