dbus-cplusplus/examples/hal
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
..
hal-listen.cpp Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++ 2008-08-14 23:59:23 +02:00
hal-listen.h Use standard types instead of typedefs wherever possible 2008-08-09 01:16:45 +02:00
Makefile.am Use autoconf convention for the configuration header (Glenn Murphy) 2008-06-14 15:40:27 +02:00