summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-18 20:27:27 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-03-18 20:27:27 +0100
commitb3b7a6763ed8d16397965db50a1197f78aaec65a (patch)
tree63de5720d3bff8a15d03fe4ac30e12ed8cc5b260 /src/gui
parentbce577e663e28e1942fda371235eba091a6ea8e2 (diff)
parent3ce3e5876c69495bfa5a7f7d326a3ff849f2f1f5 (diff)
downloadmana-b3b7a6763ed8d16397965db50a1197f78aaec65a.tar.gz
mana-b3b7a6763ed8d16397965db50a1197f78aaec65a.tar.bz2
mana-b3b7a6763ed8d16397965db50a1197f78aaec65a.tar.xz
mana-b3b7a6763ed8d16397965db50a1197f78aaec65a.zip
Merge branch '0.6'
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/serverdialog.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 5c1d35a1..f9fcb597 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -534,6 +534,7 @@ void ServerDialog::loadServers()
// Use the name listed in the server list
(*it).name = server.name;
(*it).version = server.version;
+ (*it).description = server.description;
mServersListModel->setVersionString(i, version);
found = true;
break;