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
..
2015-07-19 13:37:44 +02:00
2012-11-26 22:42:23 +01:00
2015-07-22 00:26:09 +02:00
2010-08-28 18:49:17 +02:00
2014-11-16 21:45:51 +00:00
2015-07-19 13:37:44 +02:00
2015-03-21 20:54:54 +00:00
2015-05-08 11:39:27 +03:00
2013-03-26 13:45:47 +01:00
2014-08-27 23:22:16 +02:00
2014-10-18 14:57:49 +02:00