merge from freedesktop.org
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: examples/echo/echo-server.cpp examples/properties/props-server.cpp
This commit is contained in:
commit
13219dd9fc
18 changed files with 124 additions and 167 deletions
Loading…
Add table
Add a link
Reference in a new issue