merge from official dbus-c++ fd.org repo
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: configure.ac examples/Makefile.am
This commit is contained in:
commit
fc54ec2a0b
17 changed files with 275 additions and 41 deletions
|
@ -5,7 +5,7 @@
|
|||
#include "props-glue.h"
|
||||
|
||||
class PropsServer
|
||||
: public org::freedesktop::DBus::PropsDemo,
|
||||
: public org::freedesktop::DBus::PropsDemo_adaptor,
|
||||
public DBus::IntrospectableAdaptor,
|
||||
public DBus::PropertiesAdaptor,
|
||||
public DBus::ObjectAdaptor
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue