diff options
| author | Simon McVittie <smcv@debian.org> | 2011-06-01 16:31:01 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2011-06-01 16:31:01 +0100 |
| commit | c1cc79dcde48768c2bfbda2e609c26431337eb25 (patch) | |
| tree | 6fd02438b0b2e8057a459ab3f46190f54f9adfa3 /doc | |
| parent | 78b726501405ea0109c3bf3a57c5894d38006b9f (diff) | |
| parent | 725bfb086207153fa29f71486c9c8ad09312d794 (diff) | |
| download | dbus-c1cc79dcde48768c2bfbda2e609c26431337eb25.tar.gz | |
Merge branch 'master' into experimental
Conflicts:
NEWS
configure
configure.ac
debian/changelog
doc/dbus-specification.html
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions