diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-07-21 17:20:11 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-07-21 17:20:11 +0100 |
| commit | dae42b370b7409620f8272d0816a621fd2100ee0 (patch) | |
| tree | c9b7399286c7abb17b13b6d4a5e3c6ce29d3a70f /dbus/dbus-sysdeps-unix.h | |
| parent | 27a6538d5bf1f41bb60b039a95a1b1b98728559f (diff) | |
| parent | e5ed2e2105617a9752d3807ebd5909db255b0526 (diff) | |
Merge branch 'dbus-1.8'
Conflicts:
.gitignore
NEWS
tools/dbus-monitor.c
Diffstat (limited to 'dbus/dbus-sysdeps-unix.h')
0 files changed, 0 insertions, 0 deletions