# HG changeset patch
# User Edouard TISSERANT <edouard.tisserant@gmail.com>
# Date 1259779327 -3600
# Node ID 5c26470e82a5eb428bfdbd9bca250707f6ccc6a8
# Parent  765b741fc38f12f1cec2026e480c7313d20054c1# Parent  9abbc90c02633e9c674ffce6f4f356fc4352c881
merge

diff -r 9abbc90c0263 -r 5c26470e82a5 .hgignore
--- a/.hgignore	Wed Dec 02 16:07:39 2009 +0100
+++ b/.hgignore	Wed Dec 02 19:42:07 2009 +0100
@@ -4,4 +4,5 @@
 \.pyc$
 syntax: regexp
 ^xmlclass$
-
+syntax: regexp
+^\.settings.*$