diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-08 18:42:12 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-10-08 18:42:12 +0100 |
| commit | 76c5deff5c50c118e40fcfd245f60f1b4f7c4cbd (patch) | |
| tree | aafe5d7f1a0cb8c9d148b03fa987b947920d6c23 | |
| parent | cd32cdde0ea8b953abca6e363a0b3998b9d7c06a (diff) | |
| parent | a96207da085b8fa3e2c15ab729d523a347459ea8 (diff) | |
| download | dbus-76c5deff5c50c118e40fcfd245f60f1b4f7c4cbd.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
0 files changed, 0 insertions, 0 deletions