diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-05-13 15:52:18 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-05-13 15:52:18 +0200 |
| commit | e21d06cba4cb5c5e3e201a54336e9df3c24a1c21 (patch) | |
| tree | 80b971490b3e688ddc4be4eb0bf5855adb75bf73 /dbus | |
| parent | 63196f69c420f55fbb1fa76adaa41877f7f06d7b (diff) | |
| parent | f76d17437ee95bb2621cb55c79707b9f01dcf89a (diff) | |
Merge branch 'dbus-1.2'
Conflicts:
dbus/dbus-sysdeps-util-unix.c
Diffstat (limited to 'dbus')
0 files changed, 0 insertions, 0 deletions