diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-15 20:16:16 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-15 20:16:16 +0300 |
| commit | 5c83a96b8ad85ad0562542b9720a0df6c5fb550c (patch) | |
| tree | 1759cd93802d506583c7030119f1115b0444e226 /src/gui/windows/setupwindow.cpp | |
| parent | a260aeab234704ace8ba672b1d1ce57e18425e07 (diff) | |
| parent | 22cb237571e06395ec241377721c02716f0ea8a7 (diff) | |
| download | plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.gz plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.bz2 plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.tar.xz plus-5c83a96b8ad85ad0562542b9720a0df6c5fb550c.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/gui/windows/setupwindow.cpp')
| -rw-r--r-- | src/gui/windows/setupwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 2bcac85a5..1760d00bd 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -61,9 +61,9 @@ SetupWindow::SetupWindow() : Window(_("Setup"), false, nullptr, "setup.xml"), ActionListener(), mTabs(), - mModsTab(nullptr), mWindowsToReset(), mButtons(), + mModsTab(nullptr), mResetWindows(nullptr), mPanel(new TabbedArea(this)), mVersion(new Label(this, FULL_VERSION)) |