Commit Graph

5 Commits

Author SHA1 Message Date
Shauren
fc687effce Attempt to fix centos compile 2014-07-28 10:15:31 +02:00
Shauren
c8a241c49e Core/Network: Use base Socket class for battle.net 2014-07-27 21:50:01 +02:00
Shauren
2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
2014-07-27 20:59:22 +02:00
Vincent-Michael
e108478d62 Core: Fix non build (gcc) 2014-07-20 04:22:20 +02:00
Shauren
0bcc92d900 Part 3: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-19 17:03:32 +02:00