diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 14:24:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 14:24:09 +0100 |
| commit | 59e46ef63ab478b9ad46fc7aefc2937692afc807 (patch) | |
| tree | ffe043bf049c86181db65c61561b3eb7aed2ae1d /.gitignore | |
| parent | f3147917bf0067356776839152fcf7d85c88b8a9 (diff) | |
| parent | 1f8f43a5b5e9b966d364d1d2d6ed741f07dcceaa (diff) | |
| download | ffmpeg-59e46ef63ab478b9ad46fc7aefc2937692afc807.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
error_resilience: add required headers.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions