Spp 7f061fc57f Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

2012-11-19 10:09:58 +01:00

..

2.4.3

Misc: Whitespace and tabs cleanup

2012-11-19 01:00:47 +00:00

3.0.9

Misc: Whitespace and tabs cleanup

2012-11-19 01:00:47 +00:00

3.1.3

Misc: Whitespace and tabs cleanup

2012-11-19 01:00:47 +00:00

3.2.2a

Misc: Whitespace and tabs cleanup

2012-11-19 01:00:47 +00:00

3.3.2

Misc: Whitespace and tabs cleanup

2012-11-19 01:00:47 +00:00

3.3.3a

Misc: Whitespace and tabs cleanup

2012-11-19 01:00:47 +00:00

3.3.5a

Merge branch 'master' into 4.3.4

2012-11-19 10:09:58 +01:00

4.2.2

(TDB 335.49) Also move 4.x-only SQLs to the old directory

2012-09-15 21:18:23 +01:00

4.3.4

(TDB 335.49) Also move 4.x-only SQLs to the old directory

2012-09-15 21:18:23 +01:00