diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:40:55 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-03-22 14:40:55 +0100 |
| commit | e4f86893a899ee86cfa6d238f891bec04977c966 (patch) | |
| tree | cde559857f443d530930bce3f74eb6e64b500f52 /libsettings/src | |
| parent | cd1fdbbbc2953c5e34d8c0ae6861bec4a7f6532e (diff) | |
| download | MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.gz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.lz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.tar.xz MultiMC-e4f86893a899ee86cfa6d238f891bec04977c966.zip | |
fix merge issues, make console window work again
Diffstat (limited to 'libsettings/src')
| -rw-r--r-- | libsettings/src/stubkeyring.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libsettings/src/stubkeyring.h b/libsettings/src/stubkeyring.h index 0566d5ab..b5f04e4c 100644 --- a/libsettings/src/stubkeyring.h +++ b/libsettings/src/stubkeyring.h @@ -24,7 +24,6 @@ class StubKeyring : public Keyring { - Q_OBJECT public: virtual bool storePassword(QString service, QString username, QString password); virtual QString getPassword(QString service, QString username); |