diff options
| author | Thiago Macieira <thiago@kde.org> | 2009-04-28 15:16:36 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago@kde.org> | 2009-04-28 15:16:36 +0200 |
| commit | 63196f69c420f55fbb1fa76adaa41877f7f06d7b (patch) | |
| tree | f1d97096f6c821dbd3b995b1e79749fe292e329d /dbus/dbus-sysdeps-util-unix.c | |
| parent | 705b34f0a60566c3acc88d5465603b5da959ba1f (diff) | |
| parent | b2f943e9c0d5ae1d6293d418b0c0b2a03799bb84 (diff) | |
Merge branch 'dbus-1.2'
Conflicts:
bus/bus.c
bus/config-parser-common.c
bus/config-parser-common.h
bus/config-parser.c
bus/connection.c
bus/dbus-daemon.1.in
dbus/dbus-marshal-validate-util.c
dbus/dbus-marshal-validate.c
dbus/dbus-sysdeps-util-unix.c
test/name-test/tmp-session-like-system.conf
Diffstat (limited to 'dbus/dbus-sysdeps-util-unix.c')
| -rw-r--r-- | dbus/dbus-sysdeps-util-unix.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c index dbab8236..f1e20334 100644 --- a/dbus/dbus-sysdeps-util-unix.c +++ b/dbus/dbus-sysdeps-util-unix.c @@ -1235,4 +1235,3 @@ fail: _dbus_string_free (&path); return FALSE; } - |