diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-06-18 18:37:03 +0200 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-06-18 18:37:03 +0200 |
commit | 0ad6a1bc49b890745633c12d6ca78d0fad84f0fd (patch) | |
tree | 8b1ccf53a51114779158f8f8bcece4fc9fdd1951 /.gitignore | |
parent | 6384c80725dceb50cbfdc02d65e61ed46993eb61 (diff) | |
parent | 90b6288cce3e5a433a521bc862d98d31be9624c2 (diff) | |
download | youtube-dl-0ad6a1bc49b890745633c12d6ca78d0fad84f0fd.zip youtube-dl-0ad6a1bc49b890745633c12d6ca78d0fad84f0fd.tar.gz youtube-dl-0ad6a1bc49b890745633c12d6ca78d0fad84f0fd.tar.bz2 |
Merge branch 'upstream'
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -28,13 +28,20 @@ updates_key.pem *.mp4 *.m4a *.m4v +*.mp3 *.part *.swp test/testdata +test/local_parameters.json .tox youtube-dl.zsh + +# IntelliJ related files .idea -.idea/* +*.iml + +tmp/ + # debian folder debian/files debian/youtube-dl.debhelper.log |