Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp |
||
|---|---|---|
| .. | ||
| dbus-browser.cpp | ||
| dbus-browser.h | ||
| Makefile.am | ||
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp |
||
|---|---|---|
| .. | ||
| dbus-browser.cpp | ||
| dbus-browser.h | ||
| Makefile.am | ||