summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-28 14:07:34 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-28 14:21:11 +0200
commitf0308af5fac9f009ed05044bb3e2749a8868d8a3 (patch)
treec75c29e26a7c6559459a56f9c5e6a887fcc2b6da /Makefile
parentb0edd599940491d04a49b6b4e85189460313ebd9 (diff)
parent270d7e3a1802b0a3e091fe5083a89b092b595495 (diff)
downloadffmpeg-streaming-f0308af5fac9f009ed05044bb3e2749a8868d8a3.zip
ffmpeg-streaming-f0308af5fac9f009ed05044bb3e2749a8868d8a3.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: doc: cosmetics: Consistently format list and table items Conflicts: doc/developer.texi doc/fate.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud