Merge

author cython@sagemath.math.washington.edu <none@none>

Wed, 25 Aug 2010 07:07:30 +0000 (00:07 -0700)

committer cython@sagemath.math.washington.edu <none@none>

Wed, 25 Aug 2010 07:07:30 +0000 (00:07 -0700)
author cython@sagemath.math.washington.edu <none@none>
Wed, 25 Aug 2010 07:07:30 +0000 (00:07 -0700)
committer cython@sagemath.math.washington.edu <none@none>
Wed, 25 Aug 2010 07:07:30 +0000 (00:07 -0700)
diff --cc .hgignore

index d13c35c9e613312b38e1dadf721fd7e2f8c2d68b,ff1dfed839c183649630135146ef973c75e9b658..23f13a1ab10f4c63ea433ab3ac6b037788fabe9d
--- 1/.hgignore
--- 2/.hgignore
+++ b/.hgignore
@@@ -1,15 -1,1 +1,9 @@@
- -^build/*$
+ +syntax: glob
+ +
+ +*.pyc
+ +*~
+ +.*.swp
+ +
+ +syntax: regexp
+ +^build/
+ +^_build/
- 
- 
- 
- 
- 
- 
diff --cc conf.py
Simple merge
author	cython@sagemath.math.washington.edu <none@none>
	Wed, 25 Aug 2010 07:07:30 +0000 (00:07 -0700)
committer	cython@sagemath.math.washington.edu <none@none>
	Wed, 25 Aug 2010 07:07:30 +0000 (00:07 -0700)
		1	2
.hgignore	patch \|	diff1 \|	diff2 \|	blob \| history
conf.py	patch \|	diff1 \|	diff2 \|	blob \| history