diff options
| author | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-06-26 15:14:17 -0300 |
| commit | 104c357b6a3ee181e1d657df68e38c17ba2bda77 (patch) | |
| tree | 8de7acbcf90609e153169a3d0c65eba46b93b15c /.gitignore | |
| parent | b2a74dd629c1ab3318ba0123f8814797a4fea3a4 (diff) | |
| parent | e9394ca63dab3434bc8e869de019ecd86cb604ac (diff) | |
| download | ffmpeg-104c357b6a3ee181e1d657df68e38c17ba2bda77.tar.gz | |
Merge branch 'master' into release/3.1
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 2b251c96c9..524fb73c16 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /avversion.h /lcov/ /src +/mapfile |