diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-01-01 23:48:13 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-01-01 23:48:13 +0000 |
| commit | ae9d7149aa9a9f8f276c35b2343e78aaa7c9054c (patch) | |
| tree | 8697326f4c120119e825b82f96bd239002de3712 /test/.gitignore | |
| parent | fda9d8a44aa1bde4f2777fb9ad8650f45820fb6b (diff) | |
| parent | abbbf449f17e0a74a5d9a50fb5b074e96e9b7030 (diff) | |
| download | dbus-ae9d7149aa9a9f8f276c35b2343e78aaa7c9054c.tar.gz dbus-ae9d7149aa9a9f8f276c35b2343e78aaa7c9054c.tar.bz2 dbus-ae9d7149aa9a9f8f276c35b2343e78aaa7c9054c.zip | |
Merge branch 'dbus-1.8' and prepare 1.9.6
Conflicts:
NEWS
configure.ac
test/dbus-daemon.c
Diffstat (limited to 'test/.gitignore')
0 files changed, 0 insertions, 0 deletions