From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 5 Sep 2013 17:58:42 +0000 (+0100)
Subject: Mon Jan  9 02:52:43 GMT 2012  warner@lothar.com
X-Git-Url: https://git.rkrishnan.org/simplejson/-?a=commitdiff_plain;h=0841fffaa662f231d383280a3a55b44b040f81ef;p=tahoe-lafs%2Ftahoe-lafs.git

Mon Jan  9 02:52:43 GMT 2012  warner@lothar.com
  * restore .gitignore, stop .darcs-boringfile it
---

diff --git a/.darcs-boringfile b/.darcs-boringfile
index 27de70f9..e26aa6dd 100644
--- a/.darcs-boringfile
+++ b/.darcs-boringfile
@@ -29,7 +29,6 @@
 (^|/)ChangeSet($|/)
 (^|/)\.svn($|/)
 (^|/)\.git($|/)
-\.gitignore$
 \.py[co]$
 \#
 \.cvsignore$
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..958ddd4a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,22 @@
+*.pyc
+*.pyo
+
+/build/
+/support/
+
+# these are generated at build time, and never checked in
+/src/allmydata/_version.py
+/src/allmydata/_appname.py
+
+# these are generated too
+/bin/tahoe
+/bin/tahoe.pyscript
+/bin/tahoe-script.py
+
+/.built
+/src/allmydata_tahoe.egg-info/
+Twisted-*.egg
+
+/_trial_temp*
+/dist/
+/twisted/plugins/dropin.cache