|
|
@ -1,12 +1,7 @@
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<project version="4">
|
|
|
|
<project version="4">
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<component name="ChangeListManager">
|
|
|
|
<list default="true" id="d710f475-47eb-49e0-9914-2a0070ace3db" name="Default Changelist" comment="">
|
|
|
|
<list default="true" id="d710f475-47eb-49e0-9914-2a0070ace3db" name="Default Changelist" comment="" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/GUI.py" beforeDir="false" afterPath="$PROJECT_DIR$/UIDesktop.py" afterDir="false" />
|
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/Robot.py" beforeDir="false" afterPath="$PROJECT_DIR$/Robot.py" afterDir="false" />
|
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/__init__.py" afterDir="false" />
|
|
|
|
|
|
|
|
<change beforePath="$PROJECT_DIR$/../../v1.0.15" beforeDir="false" />
|
|
|
|
|
|
|
|
</list>
|
|
|
|
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@ -51,7 +46,9 @@
|
|
|
|
<map>
|
|
|
|
<map>
|
|
|
|
<entry key="MAIN">
|
|
|
|
<entry key="MAIN">
|
|
|
|
<value>
|
|
|
|
<value>
|
|
|
|
<State />
|
|
|
|
<State>
|
|
|
|
|
|
|
|
<option name="COLUMN_ORDER" />
|
|
|
|
|
|
|
|
</State>
|
|
|
|
</value>
|
|
|
|
</value>
|
|
|
|
</entry>
|
|
|
|
</entry>
|
|
|
|
</map>
|
|
|
|
</map>
|
|
|
|