Andreas Volz c1970e2352 Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++ ... Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: include/dbus-c++/connection.h include/dbus-c++/dispatcher.h include/dbus-c++/pendingcall.h src/dispatcher.cpp		2008-08-14 23:59:23 +02:00
..
.deps	* Fixed implementation of D-Bus properties	2006-10-24 11:12:29 +00:00
echo	Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++	2008-08-14 23:59:23 +02:00
ecore	Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++	2008-08-14 23:59:23 +02:00
glib	Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++	2008-08-14 23:59:23 +02:00
hal	Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++	2008-08-14 23:59:23 +02:00
properties	Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++	2008-08-14 23:59:23 +02:00
Makefile.am	Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++	2008-08-14 23:59:23 +02:00