Merge branch 'master' of evefit.org:pyfa

Conflicts: gui/chromeTabs.py
2010-11-17 09:14:55 +01:00
parent 26df47699d a19b3b651f
commit c175328753
7 changed files with 925 additions and 1022 deletions
--- a/gui/bitmapLoader.py
+++ b/gui/bitmapLoader.py
@@ -83,6 +83,6 @@ def getImage(name, location):
    else:
        location = os.path.join(config.pyfaPath, location)
        path = os.path.join(location, name + ".png")
-    
+
    if os.path.exists(path):
        return wx.Image(path)
--- a/gui/chromeTabs.py
+++ b/gui/chromeTabs.py
--- a/icons/ctabadd.png
+++ b/icons/ctabadd.png
--- a/icons/ctabclose.png
+++ b/icons/ctabclose.png
--- a/icons/ctableft.png
+++ b/icons/ctableft.png
--- a/icons/ctabmiddle.png
+++ b/icons/ctabmiddle.png
--- a/icons/ctabright.png
+++ b/icons/ctabright.png