From: cython@sagemath.math.washington.edu <none@none>
Date: Wed, 25 Aug 2010 07:07:30 +0000 (-0700)
Subject: Merge
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=dfdc98cb3ba4c7197baed91d43ac4ad966b72f17;p=cython.git

Merge
---

dfdc98cb3ba4c7197baed91d43ac4ad966b72f17
diff --cc .hgignore
index d13c35c9,ff1dfed8..23f13a1a
--- a/.hgignore
+++ b/.hgignore
@@@ -1,15 -1,1 +1,9 @@@
 -^build/*$
 +syntax: glob
 +
 +*.pyc
 +*~
 +.*.swp
 +
 +syntax: regexp
 +^build/
 +^_build/
- 
- 
- 
- 
- 
-