diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:12:28 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-23 03:12:28 +0100 |
commit | dde996bf999a2b4ec155e78a7b6b1cd66830fb9d (patch) | |
tree | 51f135e8105fdea2389ba9aae5aa6ef0808ecf0e /common.mak | |
parent | cad2958fd7ca3f4aef88170f87652b165088b3e6 (diff) | |
parent | 0f42e06651c9c4d7581b70b9ad2b160c2525094f (diff) | |
download | ffmpeg-dde996bf999a2b4ec155e78a7b6b1cd66830fb9d.tar.gz |
Merge commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f' into release/2.2
* commit '0f42e06651c9c4d7581b70b9ad2b160c2525094f':
doc: Point to the correct, actually maintained gas-preprocessor repo
Conflicts:
doc/platform.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'common.mak')
0 files changed, 0 insertions, 0 deletions