TrinityCore

mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 05:43:12 +01:00

Files

Carbenium b82a072b25 Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

Conflicts:
	dep/cppformat/CMakeLists.txt
	dep/cppformat/ChangeLog.rst
	dep/cppformat/format.cc
	dep/cppformat/format.h
	dep/cppformat/posix.cc
	dep/cppformat/posix.h
	sql/updates/world/2015_03_16_02_world.sql
	sql/updates/world/2015_03_16_03_world.sql
	sql/updates/world/2015_03_16_04_world.sql
	sql/updates/world/2015_03_16_05_world.sql
	sql/updates/world/2015_03_16_06_world.sql
	sql/updates/world/2015_03_17_00_world.sql
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/worldserver/CMakeLists.txt

2015-07-21 23:46:56 +02:00

bzip2

Update (C) date

2015-07-19 13:37:44 +02:00

cppformat

Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4

2015-07-21 23:46:56 +02:00

g3dlite

Dep/Misc: Update deps

2015-07-19 14:38:37 +02:00

gsoap

Update (C) date