Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'

Browse Source

* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
	doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list

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

...

This commit is contained in:

Michael Niedermayer

2014-02-10 12:29:05 +01:00

parent 2e99867a4e cca4742a5e

commit ee2c1e6dd3

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