diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:40:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-24 10:41:37 +0200 |
| commit | 14a61bc3f9ad68151368bc3577bb26fe1146fbf4 (patch) | |
| tree | 35833c3caa5890fe7df7c0294b779c83a23016ea /.gitignore | |
| parent | 1152863a3f1bca11744ccfbc645185176d440c82 (diff) | |
| parent | ace87c19ed4c4882d7b9b3ce512c4c195e39a203 (diff) | |
| download | ffmpeg-14a61bc3f9ad68151368bc3577bb26fe1146fbf4.tar.gz | |
Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'
* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203':
configure: whitespace cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions