Spp 37b66384f3 Merge branch 'master' into 4.x ...

Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp

2012-01-31 11:49:53 +01:00

..

2.4.3

DB/SQL: No tabs nor CR line feeds

2011-05-18 15:51:42 +01:00

3.0.9

DB/SQL: No tabs nor CR line feeds

2011-05-18 15:51:42 +01:00

3.1.3

DB/SQL: No tabs nor CR line feeds

2011-05-18 15:51:42 +01:00

3.2.2a

DB/SQL: No tabs nor CR line feeds

2011-05-18 15:51:42 +01:00

3.3.2

DB/SQL: No tabs nor CR line feeds

2011-05-18 15:51:42 +01:00

3.3.3a

DB/SQL: No tabs nor CR line feeds

2011-05-18 15:51:42 +01:00

3.3.5a

Merge branch 'master' into 4.x

2012-01-31 11:49:53 +01:00