Merge branch 'logging_changes' of https://github.com/EQEmu/Server into logging_changes

This commit is contained in:
Akkadius 2015-01-16 02:21:14 -06:00
commit c9e7e77d4c
2 changed files with 3 additions and 0 deletions

View File

@ -1,5 +1,6 @@
#include "debug.h"
#include "tcp_server.h"
#include "../common/eqemu_logsys.h"
#include <stdio.h>
#include <cstdlib>

View File

@ -22,6 +22,7 @@
#include "../common/timer.h"
#include "../common/platform.h"
#include "../common/crash.h"
#include "../common/eqemu_logsys.h"
#include "login_server.h"
#include <time.h>
#include <stdlib.h>
@ -30,6 +31,7 @@
TimeoutManager timeout_manager;
LoginServer server;
EQEmuLogSys logger;
ErrorLog *server_log;
bool run_server = true;