![]() Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp |
||
---|---|---|
.. | ||
Makefile.am | ||
props-server.cpp | ||
propsgs-client.cpp | ||
propsgs-client.h | ||
propsgs-introspect.xml | ||
propsgs-server.cpp | ||
propsgs-server.h |