From e24791b59f0320232e747a69d64e5c1f7dc3eb3e Mon Sep 17 00:00:00 2001 From: Maru Date: Wed, 24 Jan 2018 12:23:58 -0200 Subject: [PATCH] Fix merge a little more --- .../{Server_Zone => sapphire_zone}/Social/ContentGroup.cpp | 0 src/servers/{Server_Zone => sapphire_zone}/Social/ContentGroup.h | 0 src/servers/{Server_Zone => sapphire_zone}/Social/FreeCompany.cpp | 0 src/servers/{Server_Zone => sapphire_zone}/Social/FreeCompany.h | 0 src/servers/{Server_Zone => sapphire_zone}/Social/FriendList.cpp | 0 src/servers/{Server_Zone => sapphire_zone}/Social/FriendList.h | 0 src/servers/{Server_Zone => sapphire_zone}/Social/Group.cpp | 0 src/servers/{Server_Zone => sapphire_zone}/Social/Group.h | 0 src/servers/{Server_Zone => sapphire_zone}/Social/Linkshell.cpp | 0 src/servers/{Server_Zone => sapphire_zone}/Social/Linkshell.h | 0 .../Social/Manager/ContentGroupMgr.cpp | 0 .../Social/Manager/ContentGroupMgr.h | 0 .../Social/Manager/FreeCompanyMgr.cpp | 0 .../Social/Manager/FreeCompanyMgr.h | 0 .../Social/Manager/LinkshellMgr.cpp | 0 .../{Server_Zone => sapphire_zone}/Social/Manager/LinkshellMgr.h | 0 .../{Server_Zone => sapphire_zone}/Social/Manager/PartyMgr.cpp | 0 .../{Server_Zone => sapphire_zone}/Social/Manager/PartyMgr.h | 0 .../{Server_Zone => sapphire_zone}/Social/Manager/SocialMgr.cpp | 0 .../{Server_Zone => sapphire_zone}/Social/Manager/SocialMgr.h | 0 src/servers/{Server_Zone => sapphire_zone}/Social/Party.cpp | 0 src/servers/{Server_Zone => sapphire_zone}/Social/Party.h | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename src/servers/{Server_Zone => sapphire_zone}/Social/ContentGroup.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/ContentGroup.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/FreeCompany.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/FreeCompany.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/FriendList.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/FriendList.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Group.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Group.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Linkshell.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Linkshell.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/ContentGroupMgr.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/ContentGroupMgr.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/FreeCompanyMgr.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/FreeCompanyMgr.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/LinkshellMgr.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/LinkshellMgr.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/PartyMgr.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/PartyMgr.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/SocialMgr.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Manager/SocialMgr.h (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Party.cpp (100%) rename src/servers/{Server_Zone => sapphire_zone}/Social/Party.h (100%) diff --git a/src/servers/Server_Zone/Social/ContentGroup.cpp b/src/servers/sapphire_zone/Social/ContentGroup.cpp similarity index 100% rename from src/servers/Server_Zone/Social/ContentGroup.cpp rename to src/servers/sapphire_zone/Social/ContentGroup.cpp diff --git a/src/servers/Server_Zone/Social/ContentGroup.h b/src/servers/sapphire_zone/Social/ContentGroup.h similarity index 100% rename from src/servers/Server_Zone/Social/ContentGroup.h rename to src/servers/sapphire_zone/Social/ContentGroup.h diff --git a/src/servers/Server_Zone/Social/FreeCompany.cpp b/src/servers/sapphire_zone/Social/FreeCompany.cpp similarity index 100% rename from src/servers/Server_Zone/Social/FreeCompany.cpp rename to src/servers/sapphire_zone/Social/FreeCompany.cpp diff --git a/src/servers/Server_Zone/Social/FreeCompany.h b/src/servers/sapphire_zone/Social/FreeCompany.h similarity index 100% rename from src/servers/Server_Zone/Social/FreeCompany.h rename to src/servers/sapphire_zone/Social/FreeCompany.h diff --git a/src/servers/Server_Zone/Social/FriendList.cpp b/src/servers/sapphire_zone/Social/FriendList.cpp similarity index 100% rename from src/servers/Server_Zone/Social/FriendList.cpp rename to src/servers/sapphire_zone/Social/FriendList.cpp diff --git a/src/servers/Server_Zone/Social/FriendList.h b/src/servers/sapphire_zone/Social/FriendList.h similarity index 100% rename from src/servers/Server_Zone/Social/FriendList.h rename to src/servers/sapphire_zone/Social/FriendList.h diff --git a/src/servers/Server_Zone/Social/Group.cpp b/src/servers/sapphire_zone/Social/Group.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Group.cpp rename to src/servers/sapphire_zone/Social/Group.cpp diff --git a/src/servers/Server_Zone/Social/Group.h b/src/servers/sapphire_zone/Social/Group.h similarity index 100% rename from src/servers/Server_Zone/Social/Group.h rename to src/servers/sapphire_zone/Social/Group.h diff --git a/src/servers/Server_Zone/Social/Linkshell.cpp b/src/servers/sapphire_zone/Social/Linkshell.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Linkshell.cpp rename to src/servers/sapphire_zone/Social/Linkshell.cpp diff --git a/src/servers/Server_Zone/Social/Linkshell.h b/src/servers/sapphire_zone/Social/Linkshell.h similarity index 100% rename from src/servers/Server_Zone/Social/Linkshell.h rename to src/servers/sapphire_zone/Social/Linkshell.h diff --git a/src/servers/Server_Zone/Social/Manager/ContentGroupMgr.cpp b/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Manager/ContentGroupMgr.cpp rename to src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.cpp diff --git a/src/servers/Server_Zone/Social/Manager/ContentGroupMgr.h b/src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.h similarity index 100% rename from src/servers/Server_Zone/Social/Manager/ContentGroupMgr.h rename to src/servers/sapphire_zone/Social/Manager/ContentGroupMgr.h diff --git a/src/servers/Server_Zone/Social/Manager/FreeCompanyMgr.cpp b/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Manager/FreeCompanyMgr.cpp rename to src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.cpp diff --git a/src/servers/Server_Zone/Social/Manager/FreeCompanyMgr.h b/src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.h similarity index 100% rename from src/servers/Server_Zone/Social/Manager/FreeCompanyMgr.h rename to src/servers/sapphire_zone/Social/Manager/FreeCompanyMgr.h diff --git a/src/servers/Server_Zone/Social/Manager/LinkshellMgr.cpp b/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Manager/LinkshellMgr.cpp rename to src/servers/sapphire_zone/Social/Manager/LinkshellMgr.cpp diff --git a/src/servers/Server_Zone/Social/Manager/LinkshellMgr.h b/src/servers/sapphire_zone/Social/Manager/LinkshellMgr.h similarity index 100% rename from src/servers/Server_Zone/Social/Manager/LinkshellMgr.h rename to src/servers/sapphire_zone/Social/Manager/LinkshellMgr.h diff --git a/src/servers/Server_Zone/Social/Manager/PartyMgr.cpp b/src/servers/sapphire_zone/Social/Manager/PartyMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Manager/PartyMgr.cpp rename to src/servers/sapphire_zone/Social/Manager/PartyMgr.cpp diff --git a/src/servers/Server_Zone/Social/Manager/PartyMgr.h b/src/servers/sapphire_zone/Social/Manager/PartyMgr.h similarity index 100% rename from src/servers/Server_Zone/Social/Manager/PartyMgr.h rename to src/servers/sapphire_zone/Social/Manager/PartyMgr.h diff --git a/src/servers/Server_Zone/Social/Manager/SocialMgr.cpp b/src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Manager/SocialMgr.cpp rename to src/servers/sapphire_zone/Social/Manager/SocialMgr.cpp diff --git a/src/servers/Server_Zone/Social/Manager/SocialMgr.h b/src/servers/sapphire_zone/Social/Manager/SocialMgr.h similarity index 100% rename from src/servers/Server_Zone/Social/Manager/SocialMgr.h rename to src/servers/sapphire_zone/Social/Manager/SocialMgr.h diff --git a/src/servers/Server_Zone/Social/Party.cpp b/src/servers/sapphire_zone/Social/Party.cpp similarity index 100% rename from src/servers/Server_Zone/Social/Party.cpp rename to src/servers/sapphire_zone/Social/Party.cpp diff --git a/src/servers/Server_Zone/Social/Party.h b/src/servers/sapphire_zone/Social/Party.h similarity index 100% rename from src/servers/Server_Zone/Social/Party.h rename to src/servers/sapphire_zone/Social/Party.h