summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-12 21:44:36 +0200
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-04-12 21:44:36 +0200
commit0a9bcdc30ce9db0e53da02211ec548f529245c99 (patch)
tree700515182539c3620193ba13471a2ae34552d5a4
parentd8a4c981b3bdd24903efed0623f8661021acab5b (diff)
downloadmana-0a9bcdc30ce9db0e53da02211ec548f529245c99.tar.gz
mana-0a9bcdc30ce9db0e53da02211ec548f529245c99.tar.bz2
mana-0a9bcdc30ce9db0e53da02211ec548f529245c99.tar.xz
mana-0a9bcdc30ce9db0e53da02211ec548f529245c99.zip
Revert "Default manaserv support to OFF for 0.6 release"
This reverts commit 2ed8a171b63e6b58262801d1f0e0cd10ba265971. Conflicts: CMakeLists.txt
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6996c7dc..993ce822 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ FIND_PACKAGE(Gettext)
OPTION(WITH_OPENGL "Enable OpenGL support" ON)
OPTION(ENABLE_NLS "Enable building of tranlations" ON)
-OPTION(ENABLE_MANASERV "Enable Manaserv support" OFF)
+OPTION(ENABLE_MANASERV "Enable Manaserv support" ON)
OPTION(ENABLE_CPP0X "Enable use of C++0x features" ON)
IF (WIN32)