pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-01 14:21:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into web_interface

Browse Source 
Conflicts:
	common/CMakeLists.txt
	common/eqemu_config.cpp
	common/eqemu_config.h
	common/shareddb.h
This commit is contained in:
Akkadius
2014-12-16 00:12:01 -06:00
parent 7ad2ead1be ad8e834fe8
commit fffe59c52e
55 changed files with 1216 additions and 6770 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/CMakeLists.txt
-13
View File
@@ -69,7 +69,6 @@ SET(common_sources
web_interface_utils.cpp
xml_parser.cpp
platform.cpp
patches/client62.cpp
patches/patches.cpp
patches/sod.cpp
patches/sof.cpp
@@ -197,12 +196,6 @@ SET(common_headers
web_interface_utils.h
xml_parser.h
zone_numbers.h
platform.h
patches/Client62.h
patches/Client62_constants.h
patches/Client62_itemfields.h
patches/Client62_ops.h
patches/Client62_structs.h
patches/patches.h
patches/sod.h
patches/sod_constants.h
@@ -256,11 +249,6 @@ SET(common_headers
)
SOURCE_GROUP(Patches FILES
patches/client62.h
patches/client62_itemfields.h
patches/client62_ops.h
patches/client62_constants.h
patches/client62_structs.h
patches/patches.h
patches/sod.h
patches/sod_itemfields.h
@@ -296,7 +284,6 @@ SOURCE_GROUP(Patches FILES
patches/underfoot_ops.h
patches/underfoot_constants.h
patches/underfoot_structs.h
patches/client62.cpp
patches/patches.cpp
patches/sod.cpp
patches/sof.cpp