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

Conflicts:
	changelog.txt
	common/database.cpp
	world/client.cpp
	world/zoneserver.cpp
	zone/command.cpp
This commit is contained in:
akkadius
2014-09-21 02:32:31 -05:00
22 changed files with 271 additions and 172 deletions
+2
View File
@@ -9696,6 +9696,8 @@ void Client::CompleteConnect() {
}
entity_list.RefreshClientXTargets(this);
worldserver.RequestTellQueue(GetName());
}
void Client::Handle_OP_KeyRing(const EQApplicationPacket *app)