Viano-Core

0 Fork 0

Files

T

Carbenium fd0ef7bfab Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4

Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp

2015-07-22 00:26:09 +02:00

compiler

Buildsystem/MSVC: Removed /SAFESEH linker option from x86 debug builds as it doesn't make sense in debug builds and interferes with Edit and Continue

2014-09-28 12:03:34 +02:00

macros

Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4

2015-07-22 00:26:09 +02:00

platform

Merge pull request #13432 from bloerwald/fix_compiler_detection_on_unix

2014-11-02 18:50:11 +01:00

genrev.cmake

Update (C) date