diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:36:59 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-17 19:36:59 +0100 |
| commit | b0c75963c87defa2c31661af23860854dfe15b4c (patch) | |
| tree | 6b468b64724ccaf37eaa885b1b5b178dea08a5ff /.gitignore | |
| parent | 9d4799c247e305ab480198e4942d229a2949ea9b (diff) | |
| parent | 48362ceadeb2eb5286ae94ef7f9542d990ff7ec7 (diff) | |
| download | ffmpeg-b0c75963c87defa2c31661af23860854dfe15b4c.tar.gz | |
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
doc: Update paths to match new examples location
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3e6e18ca72..f0442e28e7 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ *.so.* *.swp *.ver -*-example *-test *_g \#* |