Commit a6ba5184 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '968a62a9'

* commit '968a62a9':
  doc/APIchanges: mark the release 10 branch point

Conflicts:
	doc/APIchanges

Not merged, as there was no such branch in ffmpeg
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 6eefc578 968a62a9
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