Merge with 7fb200545bc19edaac96ba358729ac203d392705
authorraph
Wed, 09 Dec 2009 12:21:45 +0100
changeset 32 1b5327351192
parent 31 d4eaf4696b08 (current diff)
parent 25 7fb200545bc1 (diff)
child 33 fec6dd7087be
Merge with 7fb200545bc19edaac96ba358729ac203d392705
.hgignore
.pydevproject
--- 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
--- 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>