Merge branch 'master' into 4.x

Browse Source

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

...

This commit is contained in:

Spp

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

parent fdbb3e52bc d4670a558d

commit 37b66384f3

491 changed files with 15328 additions and 4368 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1444

src/server/game/Handlers/ItemHandler.cpp Executable file

File diff suppressed because it is too large Load Diff