Merge commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9' into release/1.1

Browse Source

* commit '2340ce6954db2c0a79c57fcba7f45e2fcc20cdc9':
  update Changelog

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-05-05 16:21:25 +02:00

parent ebd74c42a2 2340ce6954

commit 714dd84f20

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

Diff Content Not Available