Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++
Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++ Conflicts: include/dbus-c++/connection.h include/dbus-c++/dispatcher.h include/dbus-c++/pendingcall.h src/dispatcher.cpp
This commit is contained in:
commit
c1970e2352
57 changed files with 1642 additions and 1638 deletions
|
@ -39,12 +39,12 @@ namespace DBus {
|
|||
|
||||
struct DXXAPILOCAL Message::Private
|
||||
{
|
||||
DBusMessage* msg;
|
||||
DBusMessage *msg;
|
||||
|
||||
Private() : msg(0)
|
||||
{}
|
||||
|
||||
Private( DBusMessage* m ) : msg(m)
|
||||
Private(DBusMessage *m) : msg(m)
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue