diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-23 11:14:45 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-23 11:14:45 +0000 |
| commit | b080ba1eab764b79edb62afcfc61794f410a5591 (patch) | |
| tree | 9911fc680a5871cb06efe92a509268e509854d7e /HACKING | |
| parent | 11b31b864fe7aad4084544f9f846a2ddfe39c28a (diff) | |
| parent | 4ebb275ab7b6f71d5dbee348a1064b013bdbc862 (diff) | |
| download | dbus-b080ba1eab764b79edb62afcfc61794f410a5591.tar.gz | |
Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5
Conflicts:
configure.ac
Diffstat (limited to 'HACKING')
0 files changed, 0 insertions, 0 deletions