diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 13:04:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-16 13:04:41 +0200 |
| commit | 60058c1880f2260ad8a900d54a89a3f2cb4aa4ac (patch) | |
| tree | 9d8a6109b819948d94b9ca8d120be235940e82c7 | |
| parent | f0fbd9105bc1edbd40fc06246aded92a9a6a5d3a (diff) | |
| parent | 766f2d965ff1948749c37f26a714adb8aa89c4a9 (diff) | |
| download | ffmpeg-60058c1880f2260ad8a900d54a89a3f2cb4aa4ac.tar.gz | |
Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'
* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
gitignore: add dylib and swp entries
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 16c9c620fb..6178df26fe 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ *.pdb *.so *.so.* +*.swp *.ver *-example *-test |