From 7ee0e92cf1aa6ffb544cf6eadc8a6f0c0f205a7b Mon Sep 17 00:00:00 2001
From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Wed, 14 Aug 2013 17:39:34 +0200
Subject: Fix setup.py post-setuptools/distribute merge.

---
 .gitignore | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 46b64e3..b4d25fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,15 @@
-*.pyc
+# Temporary files
 .*.swp
+*.pyc
+*.pyo
+
+# Build-related files
+docs/_build/
 .coverage
-MANIFEST
+.tox
+*.egg-info
+*.egg
 build/
 dist/
 htmlcov/
-docs/_build
-docs/_static
-docs/_templates
-.tox
+MANIFEST
-- 
cgit v1.2.3