Merge branch 'development' into MorePreferences

2017-03-26 13:52:59 -04:00
parent 9a284bc740 225011f2c1
commit b18bb200a9
58 changed files with 1032 additions and 367 deletions
--- a/gui/builtinPreferenceViews/pyfaLoggingPreferences.py
+++ b/gui/builtinPreferenceViews/pyfaLoggingPreferences.py
@@ -76,7 +76,7 @@ class PFGeneralPref(PreferenceView):
        '''

    def getImage(self):
-        return BitmapLoader.getBitmap("prefs_settings", "gui")
+        return BitmapLoader.getBitmap("settings_log", "gui")


 PFGeneralPref.register()