Commit ee2c1e6d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'cca4742a'

* commit 'cca4742a':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2e99867a cca4742a
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment