# HG changeset patch
# User Edouard TISSERANT <edouard.tisserant@gmail.com>
# Date 1259755862 -3600
# Node ID 765b741fc38f12f1cec2026e480c7313d20054c1
# Parent  f39377f6c47acc3c2648097f1b1b7bdad2272077# Parent  649a8465148d93a1e957be0b21b05b2671d67163
merge

diff -r 649a8465148d -r 765b741fc38f .hgignore
--- a/.hgignore	Tue Dec 01 10:55:28 2009 +0100
+++ b/.hgignore	Wed Dec 02 13:11:02 2009 +0100
@@ -4,4 +4,5 @@
 \.pyc$
 syntax: regexp
 ^xmlclass$
-
+syntax: regexp
+^\.settings.*$