Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: dep/PackageList.txt src/server/game/Spells/Auras/SpellAuras.cpp
This commit is contained in:
commit
741f3dde2e
334 files changed
+487
-198930
No files matched your search
@@ -21,9 +21,6 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||
if(USE_MYSQL_SOURCES AND SERVERS)
|
||||
add_subdirectory(mysqllite)
|
||||
endif()
|
||||
if(TOOLS)
|
||||
add_subdirectory(bzip2)
|
||||
endif()
|
||||
|
||||
Reference in new issue
Block a user