diff options
| author | Colin Walters <walters@verbum.org> | 2009-07-15 17:39:17 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-07-15 17:39:17 -0400 |
| commit | 56f7ce147e82c7eb529ccba634013e97d53b23c0 (patch) | |
| tree | 6d8cc496a85d5b631f643c97736637caa1c67f46 /dbus/dbus-marshal-basic.c | |
| parent | 70c5285eb4b757fdd4e552e002c5d54072492152 (diff) | |
| parent | c6992fc56cd1b2f502258e1db520c465ab2094bb (diff) | |
Merge branch 'dbus-1.2'
Conflicts:
configure.in
Diffstat (limited to 'dbus/dbus-marshal-basic.c')
0 files changed, 0 insertions, 0 deletions