diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-24 20:31:28 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-24 20:31:28 +0100 |
| commit | 1f3b479a120002b61d9000828370d743a1d854af (patch) | |
| tree | 821beaa1962b7e19650619d3140c763f2e9c3a06 /tools | |
| parent | 79c150c51983431fe978cfec8f4fcd3cac8f07a0 (diff) | |
| parent | 1d560ff7f98880d06e4667936611beca802bd651 (diff) | |
| download | dbus-1f3b479a120002b61d9000828370d743a1d854af.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions