Merge branch '2.0'

2016-09-02 12:01:49 +02:00
parent 8a50ee8b22 878995366a
commit ad834f0f58
10 changed files with 38 additions and 12 deletions
--- a/src/gui/PasswordEdit.cpp
+++ b/src/gui/PasswordEdit.cpp
@@ -58,7 +58,7 @@ void PasswordEdit::updateStylesheet()
        // Qt on Mac OS doesn't seem to know the generic monospace family (tested with 4.8.6)
        stylesheet.append("font-family: monospace,Menlo,Monaco; ");
 #else
-        stylesheet.append("font-family: monospace; ");
+        stylesheet.append("font-family: monospace,Courier New; ");
 #endif
    }