Commit 688bf40199d357107557da260ed23c9b3ddd4db6
1 parent
19325282
Exists in
usp-navegador
FIX: Fixing errors of git use.
Showing
2 changed files
with
27 additions
and
28 deletions
Show diff stats
.gitignore
1 | -invesalius/*.classpath | ||
2 | -invesalius/*.hg | ||
3 | -invesalius/*.log | ||
4 | -invesalius/*.project | ||
5 | -invesalius/*.pyc | ||
6 | -invesalius/*.swn | ||
7 | -invesalius/*.swo | ||
8 | -invesalius/*.swp | ||
9 | -invesalius/data/*.log | ||
10 | -invesalius/data/*.pyc | ||
11 | -invesalius/gui/*.log | ||
12 | -invesalius/gui/*.pyc | ||
13 | -invesalius/gui/widgets/*.log | ||
14 | -invesalius/gui/widgets/*.pyc | ||
15 | -invesalius/reader/*.log | ||
16 | -invesalius/reader/*.pyc | ||
17 | - | ||
18 | -*.pyc | ||
19 | -*.swp | ||
20 | -*.so | ||
21 | -tags | ||
22 | -*.c | 1 | +invesalius/*.classpath |
2 | +invesalius/*.hg | ||
3 | +invesalius/*.log | ||
4 | +invesalius/*.project | ||
5 | +invesalius/*.pyc | ||
6 | +invesalius/*.swn | ||
7 | +invesalius/*.swo | ||
8 | +invesalius/*.swp | ||
9 | +invesalius/data/*.log | ||
10 | +invesalius/data/*.pyc | ||
11 | +invesalius/data/*.pyd | ||
12 | +invesalius/gui/*.log | ||
13 | +invesalius/gui/*.pyc | ||
14 | +invesalius/gui/widgets/*.log | ||
15 | +invesalius/gui/widgets/*.pyc | ||
16 | +invesalius/reader/*.log | ||
17 | +invesalius/reader/*.pyc | ||
18 | + | ||
19 | +*.pyc | ||
20 | +*.swp | ||
21 | +*.so | ||
22 | +tags | ||
23 | +*.c |
invesalius/.idea/workspace.xml
1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | - <list default="true" id="1c49d80e-bb12-444a-b5f1-49d733261d55" name="Default" comment=""> | ||
5 | - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
6 | - </list> | 4 | + <list default="true" id="1c49d80e-bb12-444a-b5f1-49d733261d55" name="Default" comment="" /> |
7 | <ignored path="invesalius.iws" /> | 5 | <ignored path="invesalius.iws" /> |
8 | <ignored path=".idea/workspace.xml" /> | 6 | <ignored path=".idea/workspace.xml" /> |
9 | <ignored path=".idea/dataSources.local.xml" /> | 7 | <ignored path=".idea/dataSources.local.xml" /> |
@@ -151,13 +149,13 @@ | @@ -151,13 +149,13 @@ | ||
151 | <component name="IdeDocumentHistory"> | 149 | <component name="IdeDocumentHistory"> |
152 | <option name="CHANGED_PATHS"> | 150 | <option name="CHANGED_PATHS"> |
153 | <list> | 151 | <list> |
154 | - <option value="$PROJECT_DIR$/data/bases.py" /> | ||
155 | <option value="$PROJECT_DIR$/data/co_registration.py" /> | 152 | <option value="$PROJECT_DIR$/data/co_registration.py" /> |
156 | <option value="$PROJECT_DIR$/data/coordinates.py" /> | 153 | <option value="$PROJECT_DIR$/data/coordinates.py" /> |
157 | <option value="$PROJECT_DIR$/gui/dialogs.py" /> | 154 | <option value="$PROJECT_DIR$/gui/dialogs.py" /> |
158 | <option value="$PROJECT_DIR$/data/trackers.py" /> | 155 | <option value="$PROJECT_DIR$/data/trackers.py" /> |
159 | <option value="$PROJECT_DIR$/constants.py" /> | 156 | <option value="$PROJECT_DIR$/constants.py" /> |
160 | <option value="$PROJECT_DIR$/gui/task_navigator.py" /> | 157 | <option value="$PROJECT_DIR$/gui/task_navigator.py" /> |
158 | + <option value="$PROJECT_DIR$/data/bases.py" /> | ||
161 | </list> | 159 | </list> |
162 | </option> | 160 | </option> |
163 | </component> | 161 | </component> |
@@ -487,13 +485,13 @@ | @@ -487,13 +485,13 @@ | ||
487 | <frame x="0" y="0" width="960" height="1040" extended-state="0" /> | 485 | <frame x="0" y="0" width="960" height="1040" extended-state="0" /> |
488 | <editor active="false" /> | 486 | <editor active="false" /> |
489 | <layout> | 487 | <layout> |
490 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35" sideWeight="0.49932158" order="0" side_tool="false" content_ui="combo" /> | 488 | + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35" sideWeight="0.49932158" order="0" side_tool="false" content_ui="combo" /> |
491 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20324324" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> | 489 | <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20324324" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
492 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> | 490 | <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> |
493 | <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 491 | <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
494 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> | 492 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
495 | <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28756756" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 493 | <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28756756" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
496 | - <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32967034" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 494 | + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32967034" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
497 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> | 495 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
498 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24945055" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> | 496 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24945055" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> |
499 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.14818764" sideWeight="0.5006784" order="2" side_tool="true" content_ui="tabs" /> | 497 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.14818764" sideWeight="0.5006784" order="2" side_tool="true" content_ui="tabs" /> |