Merge branch 'master' into Customizable-shortcuts

This commit is contained in:
marco 2015-08-16 13:52:34 +02:00
commit be82472f35
42 changed files with 708 additions and 220 deletions

View file

@ -1,5 +1,6 @@
#include "shortcutssettings.h"
#include <QFile>
#include <QStringList>
ShortcutsSettings::ShortcutsSettings(QString settingsPath, QObject *parent) : QObject(parent)
{