]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '6536da7371b4847a2824ed46b98829f127f24dad'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:31:11 +0000 (11:31 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 16 Sep 2015 09:31:11 +0000 (11:31 +0200)
* commit '6536da7371b4847a2824ed46b98829f127f24dad':
  doc: Add travis badge

Not merged as ffmpeg does not have travis officially setup.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Trivial merge