Merge remote-tracking branch 'origin/master' into 0.11

Browse source

Conflicts:
	ext/a52dec/gsta52dec.c

...

This commit is contained in:

Tim-Philipp Müller 2012-01-13 00:01:01 +00:00

parent 8cd2408f09 2e7b2d8bdf

commit 87c0b0fd1b

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