Merge branch 'dbus-1.8'
authorRalf Habacker <ralf.habacker@freenet.de>
Mon, 5 Jan 2015 10:49:13 +0000 (11:49 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Mon, 5 Jan 2015 10:49:48 +0000 (11:49 +0100)
Conflicts:
NEWS
configure.ac

1  2 
cmake/config.h.cmake
cmake/test/CMakeLists.txt
dbus/dbus-sysdeps-win.c

Simple merge
Simple merge
Simple merge