]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '24da430324735f95880c4a4a54298dc8023125bb'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:26:09 +0000 (08:26 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 07:26:09 +0000 (08:26 +0100)
* commit '24da430324735f95880c4a4a54298dc8023125bb':
  Changelog: mark the release 12 branch

This commit is a noop.

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge