diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 16:28:32 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-07-29 16:28:32 +0100 |
| commit | 6e03e0ee35ee4cce9a7415427ccd5bed163e7d45 (patch) | |
| tree | c9c9597c773de48850e532df42397f9123aa7818 | |
| parent | fe5b9d3eac9e2ee9fb99288f34eb0eaf0a4c9c66 (diff) | |
| parent | 2dfee7317cad8b189dea42e44f1082fb6d91bfe3 (diff) | |
| download | dbus-6e03e0ee35ee4cce9a7415427ccd5bed163e7d45.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
0 files changed, 0 insertions, 0 deletions