diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-01 12:19:02 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-01 12:19:02 +0100 |
| commit | a31ac98f18eaaadf2098e911388b11aa24d46fa7 (patch) | |
| tree | 81a491221adbd0db84dbe6f263474e1b78910a74 /doc/dbus-specification.xml | |
| parent | b1e28fba0bcbd62d3cfbd6ce861de036d9d0537a (diff) | |
| parent | b0503e03fd0c0959865f4d9a39cce26e7d079fb0 (diff) | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'doc/dbus-specification.xml')
0 files changed, 0 insertions, 0 deletions