projects / ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4a99134 7c3ba1b)
Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 16:28:32 +0000 (18:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Sep 2014 16:28:37 +0000 (18:28 +0200)
* cehoyos/master:
  Add a closing LF to Webm-manifest files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
FFmpeg git repo