1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-11 20:05:06 +02:00

Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'

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

Conflicts:
	doc/APIchanges

Not merged, as there was no such branch in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-18 21:03:54 +02:00
commit a6ba5184a5

Diff Content Not Available