diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-25 09:02:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-25 09:02:57 +0100 |
| commit | a8ad7e47fb59d386e8672e38305cbe94138dabd1 (patch) | |
| tree | 0afd2042ac2f0602367ac6c65fae5785c88267b1 /presets | |
| parent | 3144440004941aa22ffea9933f5e5dfe826df654 (diff) | |
| parent | 5ea14d48a82afa82a6131528c68b217aee2046bb (diff) | |
| download | ffmpeg-a8ad7e47fb59d386e8672e38305cbe94138dabd1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
texi2pod: always declare the pod file as UTF-8 encoded
Conflicts:
doc/texi2pod.pl
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets')
0 files changed, 0 insertions, 0 deletions