Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7

Browse source

Conflicts:
	configure.ac

...

This commit is contained in:

Simon McVittie 2012-01-23 11:14:45 +00:00

parent 11b31b864f 4ebb275ab7

commit b080ba1eab

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

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

Diff content is not available