diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-11-10 17:10:09 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-11-10 17:10:09 +0000 |
| commit | f44a629679b872a11fae7a923d64b540ea3b9646 (patch) | |
| tree | bda44440fe5cae654a3650f4e4834bf4eb2506a7 | |
| parent | cdd9e9a65c40ac4c21dcd36e9bd0fd6c746ad753 (diff) | |
| parent | 3210bda8013489484d4ab9f6c4adaf8d662bf6c9 (diff) | |
| download | dbus-f44a629679b872a11fae7a923d64b540ea3b9646.tar.gz | |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
0 files changed, 0 insertions, 0 deletions