# HG changeset patch
# User laurent
# Date 1259936888 -3600
# Node ID 922da7834c815a526494133c51dc8faeb22aba36
# Parent  b6ac310f95514746f762a1b985205782c6f9e5a2# Parent  5c26470e82a5eb428bfdbd9bca250707f6ccc6a8
Changes merged

diff -r b6ac310f9551 -r 922da7834c81 .hgignore
--- a/.hgignore	Fri Dec 04 15:25:36 2009 +0100
+++ b/.hgignore	Fri Dec 04 15:28:08 2009 +0100
@@ -4,4 +4,5 @@
 \.pyc$
 syntax: regexp
 ^xmlclass$
-
+syntax: regexp
+^\.settings.*$