diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-11 17:24:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-11 17:24:16 +0100 |
| commit | d229e579a314c6b893e0a92730f0bf644b4eabcd (patch) | |
| tree | 8af2e1f9f8104a12517ac8e079e79048e9f72cb2 /dbus/dbus-list.c | |
| parent | 48ad73fd5bbb77bbcbb6fa9dae50454784654374 (diff) | |
| parent | 176738f0f0f57de3f4c8553a411b26b171fdd117 (diff) | |
Merge branch 'atomic'
Conflicts:
ChangeLog
Diffstat (limited to 'dbus/dbus-list.c')
0 files changed, 0 insertions, 0 deletions