diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-01 18:49:13 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-01 18:49:13 +0000 |
| commit | be19c7133ada48661ccba6c978547da699533b60 (patch) | |
| tree | ba6d7a82b25da6693e4a9cec38055871ba629b45 /doc/dbus-specification.xml | |
| parent | 1504b281e944fb41cc2319c411fef4881df58b3b (diff) | |
| parent | ba7b85711838cf9b9dfa30dde74a636393235c3e (diff) | |
| download | dbus-be19c7133ada48661ccba6c978547da699533b60.tar.gz | |
Merge branch 'dbus-1.6'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'doc/dbus-specification.xml')
0 files changed, 0 insertions, 0 deletions