diff .hgignore @ 1169:3a1225034751

merge
author Pascal Lamblin <lamblinp@iro.umontreal.ca>
date Fri, 17 Sep 2010 14:29:49 -0400
parents 53d11eafdaa9
children 00e7e445939f
line wrap: on
line diff
--- a/.hgignore	Fri Sep 17 14:29:40 2010 -0400
+++ b/.hgignore	Fri Sep 17 14:29:49 2010 -0400
@@ -2,5 +2,6 @@
 *~
 *.swp
 *.pyc
+*.orig
 core.*
 html
\ No newline at end of file