diff options
author | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
---|---|---|
committer | Don Bright <hugh.m.bright@gmail.com> | 2011-12-01 00:46:46 (GMT) |
commit | 8e85f09b29ff8c56c26fa69e369080f1d7e09203 (patch) | |
tree | f1645b2af10067f316039b720033bef141a80ad6 /src/Preferences.h | |
parent | bcc6120f9b7ce4187c56e0f83dd021674ccdec80 (diff) | |
parent | 24d7edd8cab9cf359ccd89bf88bf7a55e2cfc21b (diff) |
Merge remote branch 'upstream/master' into cakebaby
Diffstat (limited to 'src/Preferences.h')
-rw-r--r-- | src/Preferences.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Preferences.h b/src/Preferences.h index 79fa7ab..bdc707d 100644 --- a/src/Preferences.h +++ b/src/Preferences.h @@ -34,7 +34,7 @@ public slots: void colorSchemeChanged(); void fontFamilyChanged(const QString &); void fontSizeChanged(const QString &); - void OpenGL20WarningChanged(bool); + void openCSGWarningChanged(bool); signals: void requestRedraw() const; |