Merge branch 'dbus-1.4'

Browse source

Conflicts:
	NEWS
	configure.ac

...

This commit is contained in:

Simon McVittie 2012-02-13 17:36:51 +00:00

parent 26cc04e2fa 88f5a6ed15

commit e70eea5715

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