Merge remote-tracking branch 'origin/gitignore' into python3

dimazest · Oct 20, 2013 · 98cb125 · 98cb125
2 parents 1194a72 + 09f1206
commit 98cb125
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,20 @@
 *.pyc
+*.orig
 
 resource/unittest/pipelines_test_resources/
+resource/unittest/output/
 
 .Python
 .coverage
 
 .tox/
+bin/
+lib/
+include/
+man/
+dist/
 
-*.egg/
+htmlcov/
+
+*.egg
 src/dissect.egg-info/