diff options
author | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
---|---|---|
committer | Socapex <philippe_groarke@yahoo.ca> | 2013-01-19 21:02:01 -0500 |
commit | df606ace309acaf0c78f52e1f98eabed6c844ae2 (patch) | |
tree | d9799b0e4a507d9eacbbafc1755eecea03f0b373 /src/gui/editserverdialog.cpp | |
parent | d0169223b889a115b486e974e5b287c3ccb00d85 (diff) | |
parent | 678d4e70999ade5a36862039875aa5564291d09d (diff) | |
download | manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.gz manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.bz2 manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.tar.xz manaverse-df606ace309acaf0c78f52e1f98eabed6c844ae2.zip |
Merge remote-tracking branch 'upstream/master' into osx
Diffstat (limited to 'src/gui/editserverdialog.cpp')
-rw-r--r-- | src/gui/editserverdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/editserverdialog.cpp b/src/gui/editserverdialog.cpp index 601c9fc76..bdfbdd1d5 100644 --- a/src/gui/editserverdialog.cpp +++ b/src/gui/editserverdialog.cpp @@ -1,7 +1,7 @@ /* * The Mana Client * Copyright (C) 2011-2012 The Mana Developers - * Copyright (C) 2012 The ManaPlus Developers + * Copyright (C) 2012-2013 The ManaPlus Developers * * This file is part of The ManaPlus Client. * @@ -74,7 +74,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent, mOkButton(new Button(this, _("OK"), "addServer", this)), mCancelButton(new Button(this, _("Cancel"), "cancel", this)), mTypeListModel(new TypeListModel), - mTypeField(new DropDown(this, mTypeListModel)), + mTypeField(new DropDown(this, mTypeListModel, false, true)), mServerDialog(parent), mServer(server), mIndex(index) |