diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-13 17:36:51 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-13 17:36:51 +0000 |
| commit | e70eea571509aef68289de729d4acc2b235130fd (patch) | |
| tree | fcd0b8ef8415ff2f5f0894c595d3d9c57c768973 | |
| parent | 26cc04e2fa39edab7d44cff3507ca9057f5103f6 (diff) | |
| parent | 88f5a6ed152b5b26b71f88a3992eaf40511c85ed (diff) | |
| download | dbus-e70eea571509aef68289de729d4acc2b235130fd.tar.gz | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
0 files changed, 0 insertions, 0 deletions