![]() 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 |
||
---|---|---|
.. | ||
hal-listen.cpp | ||
hal-listen.h | ||
Makefile.am |
![]() 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 |
||
---|---|---|
.. | ||
hal-listen.cpp | ||
hal-listen.h | ||
Makefile.am |