Vincent-Michael
0bebf40fe7
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/StatSystem.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Handlers/NPCHandler.cpp
2013-06-11 22:07:11 +02:00
..
2013-06-07 16:27:20 -04:00
2013-06-07 16:27:20 -04:00
2013-06-07 16:27:20 -04:00
2013-06-07 16:27:20 -04:00
2013-06-07 16:27:20 -04:00
2013-06-07 16:27:20 -04:00
2013-06-07 16:27:20 -04:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-11 22:07:11 +02:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-03 15:17:51 -04:00
2013-06-11 22:07:11 +02:00
2013-06-11 22:07:11 +02:00
2013-06-03 15:17:51 -04:00
2012-01-31 13:37:21 +00:00
2012-01-31 13:37:21 +00:00