diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-16 14:59:01 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-16 14:59:01 +0100 |
| commit | a61cfccf3111b6753673be172b43792a68f1a044 (patch) | |
| tree | d154b820e8371b49b34134b179f001da3e972922 /ChangeLog | |
| parent | 52b6106a3336ba092b5be837b3499b2a60bc8d5f (diff) | |
| parent | 3b85dfcf77dc8fe40c8ab98163725d29e1d63706 (diff) | |
| download | dbus-a61cfccf3111b6753673be172b43792a68f1a044.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions