Changeset a8ad7e47 in ffmpeg

Timestamp:

Feb 25, 2014, 8:02:57 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

bef6b27

Parents:

31444400 (diff), 5ea14d4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)