Merge commit '006c253346d90f4abaf69d78083c8ba031628598'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 17:16:45 +0000 (19:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 17:25:03 +0000 (19:25 +0200)
* commit '006c253346d90f4abaf69d78083c8ba031628598':
  doc: Fit the graph in 80 cols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/ffmpeg.texi

diff --cc doc/ffmpeg.texi
Simple merge