Merge branch '2.0'

This commit is contained in:
Felix Geyer 2015-12-15 21:05:00 +01:00
commit ecfbf72a57
33 changed files with 9516 additions and 347 deletions

View file

@ -32,6 +32,7 @@ int main(int argc, char** argv)
#ifdef QT_NO_DEBUG
Tools::disableCoreDumps();
#endif
Tools::setupSearchPaths();
Application app(argc, argv);
Application::setApplicationName("keepassx");