# HG changeset patch
# User raph
# Date 1260357705 -3600
# Node ID 1b5327351192a74d411b65de0aa718c24c67755a
# Parent  d4eaf4696b08e3af0a1811d96ae534ca14b6c370# Parent  7fb200545bc19edaac96ba358729ac203d392705
Merge with 7fb200545bc19edaac96ba358729ac203d392705

diff -r d4eaf4696b08 -r 1b5327351192 .hgignore
--- a/.hgignore	Wed Dec 09 12:20:32 2009 +0100
+++ b/.hgignore	Wed Dec 09 12:21:45 2009 +0100
@@ -25,4 +25,6 @@
 syntax: regexp
 ^parts$
 syntax: regexp
-^bin$
\ No newline at end of file
+^bin$
+syntax: regexp
+^recreate$
\ No newline at end of file
diff -r d4eaf4696b08 -r 1b5327351192 .pydevproject
--- a/.pydevproject	Wed Dec 09 12:20:32 2009 +0100
+++ b/.pydevproject	Wed Dec 09 12:21:45 2009 +0100
@@ -4,4 +4,7 @@
 <pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
+<path>/comt2/src</path>
+</pydev_pathproperty>
 </pydev_project>