*Merge.

--HG--
branch : trunk

CMakeLists.txt

@@ -49,11 +49,12 @@ if(CONF_DIR)
 else(CONF_DIR)
 SET(CONF_DIR ${PREFIX}/etc)
 endif(CONF_DIR)
+SET(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
 
 message("* Will install to: ${CMAKE_INSTALL_PREFIX}")
 message("* With config dir at: ${CONF_DIR}")
+message("* Libs install dir at: ${LIBSDIR}")
 
-SET(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
 FIND_LIBRARY(SSLLIB NAMES ssl DOC "SSL library")
 FIND_LIBRARY(ZLIB z "Zlib library")
 

sql/characters.sql

@@ -774,7 +774,6 @@ LOCK TABLES `character_tutorial` WRITE;
 UNLOCK TABLES;
 
 --
-  `arena_pending_points` int (10) UNSIGNED NOT NULL default '0',
 -- Table structure for table `corpse`
 --