Merge with default

--HG--
branch : compatibility

.hgtags

@@ -3,10 +3,6 @@ a409552f83cb55a5c20f867fd7bcae1d0083d01a ryzomcore_0_8_0
 0000000000000000000000000000000000000000 ryzomcore_0_8_0
 0000000000000000000000000000000000000000 ryzomcore_0_8_0
 4eddbaff0c5e5d685db96ee3e8427aa0fd96ac83 ryzomcore_0_8_0
-2e439cca8c3746df8ea64e1aab2d4d2ab9ca95d8 latest-default-graft
-2e439cca8c3746df8ea64e1aab2d4d2ab9ca95d8 latest-default-graft
-e4680cd1f1ce24747c4db73eeb4b107f6f6c45d4 latest-default-graft
-e4680cd1f1ce24747c4db73eeb4b107f6f6c45d4 latest-default-graft
-8162b598e9e233ce0886d3b8b41151f12a7bff01 latest-default-graft
-8162b598e9e233ce0886d3b8b41151f12a7bff01 latest-default-graft
-5f0b297fb908985504cef899469bfca9a9f9816c latest-default-graft
+
+950d650ca92e6041611258d7e5131ccf661e4ec2 latest-graft-to-default
+950d650ca92e6041611258d7e5131ccf661e4ec2 latest-merge-from-default

code/ryzom/tools/leveldesign/georges_dll/stdafx.cpp

@@ -19,6 +19,3 @@
 //	stdafx.obj will contain the pre-compiled type information
 
 #include "stdafx.h"
-
-
-void foo_std_afx_to_remove_warning() {};

code/ryzom/tools/server/ryzom_ams/www/html/installer/libsetup.php

@@ -56,6 +56,7 @@
     if (!isset($_POST['function'])) { 
         //require the pages that are being needed.
         require_once( '../config.default.php' );
+        require_once( $AMS_LIB.'/libinclude.php' );
         ini_set( "display_errors", true );
         error_reporting( E_ALL );