From 688bf40199d357107557da260ed23c9b3ddd4db6 Mon Sep 17 00:00:00 2001
From: vhosouza <victorhos@hotmail.com>
Date: Thu, 25 Jun 2015 19:15:56 -0300
Subject: [PATCH] FIX: Fixing errors of git use.

---
 .gitignore                     | 45 +++++++++++++++++++++++----------------------
 invesalius/.idea/workspace.xml | 10 ++++------
 2 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8aa7a97..38842ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,23 @@
-invesalius/*.classpath
-invesalius/*.hg
-invesalius/*.log
-invesalius/*.project
-invesalius/*.pyc
-invesalius/*.swn
-invesalius/*.swo
-invesalius/*.swp
-invesalius/data/*.log
-invesalius/data/*.pyc
-invesalius/gui/*.log
-invesalius/gui/*.pyc
-invesalius/gui/widgets/*.log
-invesalius/gui/widgets/*.pyc
-invesalius/reader/*.log
-invesalius/reader/*.pyc
-
-*.pyc
-*.swp
-*.so
-tags
-*.c
+invesalius/*.classpath
+invesalius/*.hg
+invesalius/*.log
+invesalius/*.project
+invesalius/*.pyc
+invesalius/*.swn
+invesalius/*.swo
+invesalius/*.swp
+invesalius/data/*.log
+invesalius/data/*.pyc
+invesalius/data/*.pyd
+invesalius/gui/*.log
+invesalius/gui/*.pyc
+invesalius/gui/widgets/*.log
+invesalius/gui/widgets/*.pyc
+invesalius/reader/*.log
+invesalius/reader/*.pyc
+
+*.pyc
+*.swp
+*.so
+tags
+*.c
diff --git a/invesalius/.idea/workspace.xml b/invesalius/.idea/workspace.xml
index dad1996..7bf4fba 100644
--- a/invesalius/.idea/workspace.xml
+++ b/invesalius/.idea/workspace.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1c49d80e-bb12-444a-b5f1-49d733261d55" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-    </list>
+    <list default="true" id="1c49d80e-bb12-444a-b5f1-49d733261d55" name="Default" comment="" />
     <ignored path="invesalius.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path=".idea/dataSources.local.xml" />
@@ -151,13 +149,13 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/data/bases.py" />
         <option value="$PROJECT_DIR$/data/co_registration.py" />
         <option value="$PROJECT_DIR$/data/coordinates.py" />
         <option value="$PROJECT_DIR$/gui/dialogs.py" />
         <option value="$PROJECT_DIR$/data/trackers.py" />
         <option value="$PROJECT_DIR$/constants.py" />
         <option value="$PROJECT_DIR$/gui/task_navigator.py" />
+        <option value="$PROJECT_DIR$/data/bases.py" />
       </list>
     </option>
   </component>
@@ -487,13 +485,13 @@
     <frame x="0" y="0" width="960" height="1040" extended-state="0" />
     <editor active="false" />
     <layout>
-      <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" />
+      <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" />
       <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" />
       <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" />
       <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" />
       <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" />
       <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" />
-      <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" />
+      <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" />
       <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" />
       <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" />
       <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" />
--
libgit2 0.21.2