mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 18:52: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:
+11
-11
@@ -16,18 +16,18 @@
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*/
|
||||
|
||||
#include "../common/global_define.h"
|
||||
#include "../common/eqemu_logsys.h"
|
||||
#include "client.h"
|
||||
|
||||
#include "../common/strings.h"
|
||||
#include "quest_parser_collection.h"
|
||||
#include "worldserver.h"
|
||||
#include "zonedb.h"
|
||||
#include "../common/events/player_event_logs.h"
|
||||
#include "bot.h"
|
||||
#include "../common/evolving_items.h"
|
||||
#include "../common/repositories/character_corpse_items_repository.h"
|
||||
#include "queryserv.h"
|
||||
#include "common/eqemu_logsys.h"
|
||||
#include "common/events/player_event_logs.h"
|
||||
#include "common/evolving_items.h"
|
||||
#include "common/repositories/character_corpse_items_repository.h"
|
||||
#include "common/strings.h"
|
||||
#include "zone/bot.h"
|
||||
#include "zone/queryserv.h"
|
||||
#include "zone/quest_parser_collection.h"
|
||||
#include "zone/worldserver.h"
|
||||
#include "zone/zonedb.h"
|
||||
|
||||
extern WorldServer worldserver;
|
||||
extern QueryServ *QServ;
|
||||
|
||||
Reference in New Issue
Block a user