Merge branch 'master' into plugins

Browse Source

Conflicts:
	configure.ac

...

This commit is contained in:

James Booth 2014-07-17 00:12:28 +01:00

parent d72ab08872 996817d67f

commit daa7f272a1

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 Not Available