From 3e709faeb25cbe33cc053eb58085400c68214eed Mon Sep 17 00:00:00 2001
From: Shuge Lee <shuge.lee@gmail.com>
Date: Wed, 16 Jan 2013 13:46:33 +0800
Subject: [PATCH] Add .gitignore

Conflicts:

	.gitignore
---
 .gitignore | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index fb34014ef..e67fa44d0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,5 @@
-*.o
 *.pyc
-build/
-dist/
-.DS_Store
-.hg/
-.hgignore
-.idea/
-.project/
-Demos/ignores/
-Pillow.egg-info/
+*.egg-info
+build
+dist
+.tox