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
2015-07-22 00:08:04 +02:00
2015-07-19 14:38:37 +02:00
2015-07-19 13:37:44 +02:00
2015-07-19 13:37:44 +02:00
2015-07-19 15:03:13 +02:00
2015-07-19 14:38:37 +02:00
2014-06-21 19:39:16 +02:00
2012-11-12 10:29:52 +01:00
2013-07-20 14:55:25 +01:00
2015-07-19 14:38:37 +02:00
2015-07-19 13:37:44 +02:00
2015-07-21 23:46:56 +02:00
2015-07-22 00:26:09 +02:00