merge with dev

This commit is contained in:
Desmis
2019-10-12 08:50:16 +02:00
59 changed files with 3161 additions and 2563 deletions

View File

@@ -1265,7 +1265,7 @@ void Options::readFromFile(Glib::ustring fname)
}
if (keyFile.has_key("GUI", "PseudoHiDPISupport")) {
pseudoHiDPISupport = keyFile.get_boolean("GUI", "PseudoHiDPISupport");
pseudoHiDPISupport = keyFile.get_boolean("GUI", "PseudoHiDPISupport");
}
if (keyFile.has_key("GUI", "LastPreviewScale")) {