Vincent-Michael 79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp

2014-07-09 21:09:47 +02:00

..

authserver

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-28 21:08:20 +02:00

collision

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-21 00:07:48 +02:00

game

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-07-09 21:09:47 +02:00

scripts

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-07-09 21:09:47 +02:00

shared

Core/DataStores: Implemented uint64 field type for DBC files and fixed structure of Achievement_Criteria.dbc

2014-06-27 00:37:17 +02:00

worldserver

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2014-06-27 19:39:23 +02:00

CMakeLists.txt

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00