Merge git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: configure.ac examples/Makefile.am |
||
|---|---|---|
| .. | ||
| api.h | ||
| connection.h | ||
| dbus.h | ||
| debug.h | ||
| dispatcher.h | ||
| ecore-integration.h | ||
| error.h | ||
| eventloop-integration.h | ||
| eventloop.h | ||
| glib-integration.h | ||
| interface.h | ||
| introspection.h | ||
| message.h | ||
| object.h | ||
| pendingcall.h | ||
| property.h | ||
| refptr_impl.h | ||
| server.h | ||
| types.h | ||
| util.h | ||