diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-26 19:21:22 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-26 19:21:22 +0200 |
| commit | 741f3dde2e880baf3439fe60f7166cea14b70196 (patch) | |
| tree | c7f49c46c258d1a587dee4b4367f5436a833c93e /dep/CMakeLists.txt | |
| parent | 67fc6a9b42879bc6ea9010293780d4f82d9cb09e (diff) | |
| parent | febb26d4b711762b1ee605705e7fa949b9871df1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
dep/PackageList.txt
src/server/game/Spells/Auras/SpellAuras.cpp
Diffstat (limited to 'dep/CMakeLists.txt')
| -rw-r--r-- | dep/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index 5a32cb2c810..8ae2e7ac6d7 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -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() |