Cleanup merge

--HG--
branch : gsoc2012-fabien

.hgeol

@@ -5,9 +5,6 @@
 **/database.xml = BIN
 **/msg.xml = BIN
 
-**/database.xml = BIN
-**/msg.xml = BIN
-
 **.txt = native
 **.xml = native
 

.hgignore

@@ -158,9 +158,9 @@ code/nelns/build/*
 code/snowballs/build/*
 code/ryzom/build/*
 code/build/*
+code/build-2010/*
 build/*
 install/*
-code/nel/tools/build_gamedata/configuration/buildsite.py
 
 # Linux nel compile
 code/nel/build/nel-config
@@ -227,18 +227,13 @@ code/ryzom/server/src/tick_service/tick_service
 
 # Pipeline garbage and output
 */generated/*
-code/ryzom/server/data_shard/collisions/*
-code/ryzom/common/data_common/visual_slot.tab
-code/ryzom/common/data_common/landscape_col_prim_pacs_list.txt
-code/ryzom/client/data/gamedev/*_words_*
-code/ryzom/client/data/gamedev/*.uxt
-code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheets.txt
-code/ryzom/common/data_leveldesign/leveldesign/Game_elem/sheet_id.bin
 code/nel/tools/build_gamedata/configuration/buildsite.py
 code/nel/tools/build_gamedata/configuration/upload.py
 code/nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
 code/nel/tools/build_gamedata/processes/sheets/item_association.dbg
 code/nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg
+code/nel/tools/build_gamedata/processes/rbank/build_rbank.cfg
+code/nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg
 
 # WebTT temp dir
 code/ryzom/tools/server/www/webtt/app/tmp
@@ -257,7 +252,3 @@ ryzom_tools*
 #Dumps
 *.dmp
 
-code/nel/tools/build_gamedata/processes/ai_wmap/ai_build_wmap.cfg
-code/nel/tools/build_gamedata/processes/sheets/sheets_packer.cfg
-code/nel/tools/build_gamedata/processes/rbank/build_rbank.cfg
-code/nel/tools/build_gamedata/processes/zone/debug_zone_dependencies.cfg

code/ryzom/client/src/release.cpp

@@ -91,6 +91,7 @@
 #include "faction_war_manager.h"
 #include "interface_v3/interface_ddx.h"
 #include "bg_downloader_access.h"
+#include "nel/gui/lua_manager.h"
 #include "camera_animation_manager/camera_animation_player.h"