Merge tag 'upstream/2012.02.27+gita171dbf'

[youtubedl] / .gitignore

diff --git a/.gitignore b/.gitignore
index 95401e0a7d3280d88dd6c609a2d182a3a9d34653..e51512d4f2b19ea07bdbce4e15043f13797eaa2e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.pyc
 *.pyo
 *~
 *.pyc
 *.pyo
 *~

+wine-py2exe/
+py2exe.log