diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:20:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:20:35 +0200 |
| commit | ed9ab30f4cca55f0306fb91ad79562f1de4d3bb7 (patch) | |
| tree | 6f87f79b763f57e79bf5b47d1976a0ff2720df8d /libavutil/parseutils.c | |
| parent | 1fabe4ae8cc07d80c735bb45858f542bb0aea944 (diff) | |
| parent | d791e8c990a752435d993df01516ebe469d94535 (diff) | |
| download | ffmpeg-ed9ab30f4cca55f0306fb91ad79562f1de4d3bb7.tar.gz | |
Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1
* commit 'd791e8c990a752435d993df01516ebe469d94535':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/parseutils.c')
0 files changed, 0 insertions, 0 deletions