diff options
| author | Simon McVittie <smcv@debian.org> | 2012-06-05 13:28:04 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2012-06-05 13:28:04 +0100 |
| commit | ec3035d8c25b7799fbe79a5caaa9d84bdbaca346 (patch) | |
| tree | 393d5320121757854fdabd84a7b35557045d4a96 /ChangeLog | |
| parent | 240a7a11d080e12a8572a65559b007518a985f1f (diff) | |
| parent | e47c893cfd9e825ca2077a7f2733336de67af10f (diff) | |
| download | dbus-ec3035d8c25b7799fbe79a5caaa9d84bdbaca346.tar.gz | |
Merge branch 'upstream-experimental' into upstream
Conflicts:
NEWS
bus/Makefile.am
bus/Makefile.in
bus/bus.c
bus/main.c
cmake/CMakeLists.txt
config.h.in
configure
configure.ac
dbus-1-uninstalled.pc.in
dbus/Makefile.am
dbus/Makefile.in
dbus/dbus-connection.c
dbus/dbus-marshal-basic.c
dbus/dbus-marshal-header.c
dbus/dbus-message-private.h
dbus/dbus-message.c
dbus/dbus-pending-call.c
dbus/dbus-server.c
dbus/dbus-sysdeps-unix.c
dbus/dbus-test.c
doc/dbus-faq.html
doc/dbus-launch.1
doc/dbus-send.1
doc/dbus-specification.html
doc/dbus-test-plan.html
test/Makefile.am
test/Makefile.in
test/data/valid-config-files/incoming-limit.conf
test/dbus-daemon.c
test/internals/refs.c
test/marshal.c
test/name-test/Makefile.in
tools/Makefile.in
tools/dbus-monitor.c
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions