Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1

Browse Source

* commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f':
  Update Changelog for 9.12

Conflicts:
	Changelog

Not merged, as the changelog does not apply to FFmpeg like this

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

...

This commit is contained in:

Michael Niedermayer

2014-04-21 14:19:35 +02:00

parent 4ccde2d356 f1a2364ceb

commit 1fabe4ae8c

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