mirror of
https://github.com/EQEmu/Server.git
synced 2026-06-16 01:28:22 +00:00
Merge upstream/master to incorporate EQEmu fixes
Resolve CMake style conflict in common/CMakeLists.txt by adopting the lowercase CMake command style used consistently throughout the upstream codebase.
This commit is contained in:
@@ -1,11 +1,9 @@
|
||||
#include "../common/evolving_items.h"
|
||||
|
||||
#include "../common/events/player_event_logs.h"
|
||||
#include "../common/global_define.h"
|
||||
|
||||
#include "client.h"
|
||||
#include "string_ids.h"
|
||||
#include "worldserver.h"
|
||||
|
||||
#include "common/events/player_event_logs.h"
|
||||
#include "common/evolving_items.h"
|
||||
#include "zone/string_ids.h"
|
||||
#include "zone/worldserver.h"
|
||||
|
||||
extern WorldServer worldserver;
|
||||
extern QueryServ* QServ;
|
||||
|
||||
Reference in New Issue
Block a user