Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Browse source

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:

Andreas Volz 2008-08-14 23:59:23 +02:00

parent 7e098eaf9e f0a9278511

commit c1970e2352

57 changed files with 1642 additions and 1638 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files