Vincent-Michael d25c2e7f5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp

2013-09-05 16:46:14 +02:00

..

CMakeLists.txt

Merge branch 'master' into 4.3.4

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

OutdoorPvPHP.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

OutdoorPvPHP.h

Update copyright note for 2013.

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

OutdoorPvPNA.cpp

Core/Misc: Fixed some more issues found by static code analysis tools.

2013-09-03 17:31:02 -05:00

OutdoorPvPNA.h

First step of comment style refactoring to doxygen-style.

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

OutdoorPvPSI.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

OutdoorPvPSI.h

Update copyright note for 2013.

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

OutdoorPvPTF.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

OutdoorPvPTF.h

Update copyright note for 2013.

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

OutdoorPvPZM.cpp

Misc: Use override and final C++11 keywords in a few places (mostly scripts)

2013-07-06 20:21:45 +01:00

OutdoorPvPZM.h

First step of comment style refactoring to doxygen-style.

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