aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-25 23:01:34 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-25 23:01:34 +0100
commit2f3a86a7613757bf3aa6352d6dc4741e0419108e (patch)
tree85c644d86f197fdc8aa4bbfe456636ea189fbf07 /Makefile
parent935c659c030f7aaf9bd99c19f2a51863ef83f002 (diff)
downloadffmpeg-2f3a86a7613757bf3aa6352d6dc4741e0419108e.tar.gz
doc/ffmpeg.texi
Merge changes from avconv.texi since the last merge into ffmpeg.texi Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions