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

Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Pet/Pet.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp

2013-03-21 22:00:01 +01:00

..

auth

DB/Auth/Schema: Change secId from int(10)u to tinyint(3)u in rbac_security_level_groups

2013-03-11 14:46:38 +00:00

characters

Unbreak the build and renamed sql file to proper date

2013-03-04 17:08:07 +01:00

world

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

2013-03-21 22:00:01 +01:00