Vincent_Michael a9b740ab74 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.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/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/shared/Packets/ByteBuffer.h

2013-03-10 01:08:55 +01:00

..

CommandLine

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

PrecompiledHeaders

Core/PCH: Added WorldSocket.h include to PCH for worldserver.

2010-11-08 23:40:26 +01:00

RemoteAccess

Core/RA: Addition to previous crashfix

2013-02-14 13:30:51 +01:00

TCSoap

Core/RBAC: Remove unnecessary header includes from other header files

2013-02-25 15:48:17 +01:00

WorldThread

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

CMakeLists.txt

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-03-10 01:08:55 +01:00

Main.cpp

First step of comment style refactoring to doxygen-style.

2013-03-08 21:55:37 +01:00

Master.cpp

Core/Logging: Use correct realmId when logging to DB

2013-01-16 08:59:56 +01:00

Master.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

resource.h

rename world server directory (trinitycore) to worldserver, rename authserver directory (trinityrealm) to authserver to reflect their real purposes

2010-06-05 22:44:53 +02:00

worldserver.conf.dist

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-03-09 00:32:33 +01:00

worldserver.ico

Fixed icons for windows

2010-08-08 21:04:56 +02:00

worldserver.rc

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00