Merge remote-tracking branch 'remotes/origin/master' into logging_changes

Browse Source

Conflicts:
	world/client.cpp
	world/worlddb.cpp
	zone/aggro.cpp
	zone/bot.cpp
	zone/client.cpp
	zone/client_packet.cpp
	zone/client_process.cpp
	zone/doors.cpp
	zone/entity.cpp
	zone/inventory.cpp
	zone/mob_ai.cpp
	zone/perl_client.cpp
	zone/spells.cpp
	zone/waypoints.cpp
	zone/zone.cpp
	zone/zonedb.cpp
	zone/zoning.cpp

...

This commit is contained in:

Akkadius

2015-01-21 17:29:30 -06:00

parent 51b3ae9e0a a71690b725

commit c5447778a6

109 changed files with 2543 additions and 2939 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

zone/zonedb.cpp

+244 -372

File diff suppressed because it is too large Load Diff