aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-06-18 18:37:03 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-06-18 18:37:03 +0200
commit0ad6a1bc49b890745633c12d6ca78d0fad84f0fd (patch)
tree8b1ccf53a51114779158f8f8bcece4fc9fdd1951 /.gitignore
parent6384c80725dceb50cbfdc02d65e61ed46993eb61 (diff)
parent90b6288cce3e5a433a521bc862d98d31be9624c2 (diff)
downloadyoutube-dl-0ad6a1bc49b890745633c12d6ca78d0fad84f0fd.zip
youtube-dl-0ad6a1bc49b890745633c12d6ca78d0fad84f0fd.tar.gz
youtube-dl-0ad6a1bc49b890745633c12d6ca78d0fad84f0fd.tar.bz2
Merge branch 'upstream'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index cba6fb3..97cadc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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