diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-09 11:06:32 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-02-09 11:06:32 +0000 |
| commit | a3c1b66b7a784280b0763ee4014c258144ae7876 (patch) | |
| tree | c505c8b1633b1f83ae953769741ba1c13b0bd7ae /test | |
| parent | 239fa2081293ed26455e98b73a6c484730b00372 (diff) | |
| parent | 03c5e161752fe1ff4925955800ca9c78d09a6e0c (diff) | |
| download | dbus-a3c1b66b7a784280b0763ee4014c258144ae7876.tar.gz | |
Merge branch '1.8-cve-2015-0245' into cve-2015-0245
Conflicts:
NEWS
bus/system.conf.in
configure.ac
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions