diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-05 13:12:36 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-05 13:12:36 +0100 |
| commit | f8e180476f1b9f8d0149542b740b577169863cf8 (patch) | |
| tree | e86661b9a79012525e6100fa309f778e70b9c854 | |
| parent | 7d8895e4f49c78d6acb2486250753fbeeae6a610 (diff) | |
| parent | ad5b3128ba219c895ee084eb027a296b207df16b (diff) | |
| download | dbus-f8e180476f1b9f8d0149542b740b577169863cf8.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
tools/run-with-tmp-session-bus.sh
0 files changed, 0 insertions, 0 deletions