]> git.sesse.net Git - ffmpeg/commit
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)
commita07b0ffdc3424b729238d3cbd0673af9095a90f6
treebbf159fbf23f2b455dc91e0999b05e9c3a690bfb
parent4a99134f1a71994a0dc4542a0d6bee8e36146b60
parent7c3ba1b83aebab68366e1fb333133a8e2a338019
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a closing LF to Webm-manifest files.

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