[FFmpeg-cvslog] Merge commit '94f084324e648876508bed546d950762f10b875e'
Michael Niedermayer
git at videolan.org
Wed Sep 3 12:32:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 3 12:24:47 2014 +0200| [4d13d440ee75321523be88fff1f38f3a154c53b5] | committer: Michael Niedermayer
Merge commit '94f084324e648876508bed546d950762f10b875e'
* commit '94f084324e648876508bed546d950762f10b875e':
texi2pod: Make it output a single encoding string
Conflicts:
doc/texi2pod.pl
See: 12ce58bebdff6bfae9c56dc785e3003968f93277
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4d13d440ee75321523be88fff1f38f3a154c53b5
---
More information about the ffmpeg-cvslog
mailing list