diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-05 18:12:33 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-05 18:12:33 +0100 |
| commit | 0fb44ad6aae16bc48cf4e93078909f2bdeddb880 (patch) | |
| tree | 1e88ecefe80503d6bd31afca5f58bba2d42a70bc /.gitignore | |
| parent | 6e1d035210d140b7d3a5fa00c3841e32f3398dc8 (diff) | |
| parent | 7177fd24f8ed262024501c1020e5791c811fbfe4 (diff) | |
| download | youtube-dl-0fb44ad6aae16bc48cf4e93078909f2bdeddb880.zip youtube-dl-0fb44ad6aae16bc48cf4e93078909f2bdeddb880.tar.gz youtube-dl-0fb44ad6aae16bc48cf4e93078909f2bdeddb880.tar.bz2 | |
Merge branch 'upstream'
Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,5 +1,6 @@ *.pyc *.pyo +*.class *~ *.DS_Store wine-py2exe/ |