![]() Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp |
||
---|---|---|
.. | ||
.deps | ||
echo | ||
ecore | ||
glib | ||
hal | ||
properties | ||
Makefile.am |
![]() Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp |
||
---|---|---|
.. | ||
.deps | ||
echo | ||
ecore | ||
glib | ||
hal | ||
properties | ||
Makefile.am |