Mercurial > hg > truffle
view mx/.pydevproject @ 9382:b59b10ddc797
Do not combine merge with succeeding merge if it holds a stateAfter and the succeeding merge does not.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Sun, 28 Apr 2013 06:31:30 +0200 |
parents | 527724d26036 |
children |
line wrap: on
line source
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?eclipse-pydev version="1.0"?> <pydev_project> <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property> <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property> <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> <path>/mx</path> </pydev_pathproperty> <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH"> <path>/mxtool</path> </pydev_pathproperty> </pydev_project>