diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-09-16 17:50:14 +0100 |
| commit | 1909a82a8a871781f9a488881944912c7cc367e6 (patch) | |
| tree | b06581f13abfc573246a0a6a2c3d253cbe993151 /test | |
| parent | eca7a1c5e0b2fbb4edee3aa3965d2eec451bd66b (diff) | |
| parent | 8874d3a0c57c0cae97cbe426e3686936da53f649 (diff) | |
| download | dbus-1909a82a8a871781f9a488881944912c7cc367e6.tar.gz | |
Merge branch 'dbus-1.8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions