Merge branch 'master' of github.com:eressea/server

src/bind_tolua.c

@@ -8,6 +8,7 @@
 #include "log.pkg.c"
 #include "process.pkg.c"
 #include "settings.pkg.c"
+#pragma warning(pop)
 
 void tolua_bind_open(lua_State * L) {
     tolua_eressea_open(L);

src/kernel/save.c

@@ -20,7 +20,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <kernel/config.h>
 #include "save.h"
 
-#include "../buildno.h"
+#include <buildno.h>
 
 #include "alchemy.h"
 #include "alliance.h"