Skip to content
Snippets Groups Projects
Commit a6ba5184 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 6eefc578 968a62a9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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