Shauren 7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp

2014-09-12 20:26:46 +02:00

..

achievement_scripts.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

action_ip_logger.cpp

Core/Misc: Fixed warnings

2014-06-24 02:01:40 +02:00

areatrigger_scripts.cpp

Scripts/AreaTriggers: Fix an issue with an AT for the quest The Etymidian (Sholazar Waygate)

2014-07-24 15:15:18 +01:00

boss_emerald_dragons.cpp

Core: Remove again whitespace (meh :/)

2014-09-07 04:06:50 +02:00

chat_log.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

CMakeLists.txt

Core/Misc:

2014-06-13 16:25:11 +02:00

go_scripts.cpp

Merge remote-tracking branch 'origin/master' into 4.3.4

2014-09-07 19:36:33 +01:00

guards.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-08-31 20:42:02 +02:00

item_scripts.cpp

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

2014-08-26 19:21:22 +02:00

mob_generic_creature.cpp

Core/Misc: Refactor scripts to fix static analysis warnings

2014-08-31 20:42:02 +02:00

npc_innkeeper.cpp

Scripts/Misc: random fixes

2014-06-14 17:48:47 +02:00

npc_professions.cpp

Merge branch master into boost

2014-07-13 16:52:38 -05:00

npc_taxi.cpp

Core/Misc: Remove obsolete C++11 backward compatibility macros

2014-04-29 16:35:11 +02:00

npcs_special.cpp

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

2014-09-12 20:26:46 +02:00