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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp

2014-05-18 19:40:30 +02:00

..

AlteracValley

Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic.

2014-05-15 21:32:47 +02:00

BaradinHold

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

2014-04-29 20:14:42 +02:00

BlackrockMountain

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

Deadmines

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

2014-04-29 20:14:42 +02:00

Gnomeregan

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

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

Karazhan

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

2014-05-18 19:40:30 +02:00

MagistersTerrace

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

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

ScarletEnclave

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

2014-04-29 20:14:42 +02:00

ScarletMonastery

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

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

Scholomance

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

ShadowfangKeep

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

Stratholme

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

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

SunkenTemple

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

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

SunwellPlateau

Scripts/SWP: Sathrovarr will no longer cause player teleports on grid load

2014-05-13 11:32:56 +01:00

TheStockade

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

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

Uldaman

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

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

ZulAman

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

ZulGurub

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

CMakeLists.txt

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_alterac_mountains.cpp

Update copyright note for 2014.

2014-01-01 00:07:53 +01:00

zone_arathi_highlands.cpp

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

2014-04-29 20:14:42 +02:00

zone_blasted_lands.cpp

Partially revert f296095191 "Fix various warnings. The core, the scripts and the tools now compile without warnings with -Wall -Wextra -pedantic."

2014-05-18 12:50:10 +02:00

zone_burning_steppes.cpp

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

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

zone_duskwood.cpp

Scripts/Duskwood: prevention to spawn multiple Twilight Corrupter and fixed some issues there

2014-05-09 16:59:55 +02:00

zone_eastern_plaguelands.cpp

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

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

zone_eversong_woods.cpp

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

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

zone_ghostlands.cpp

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

2014-04-29 20:14:42 +02:00

zone_hinterlands.cpp

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

2014-04-29 20:14:42 +02:00

zone_ironforge.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00:00

zone_isle_of_queldanas.cpp

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

2014-04-29 20:14:42 +02:00

zone_loch_modan.cpp

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

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

zone_redridge_mountains.cpp

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

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

zone_silverpine_forest.cpp

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

2014-04-29 20:14:42 +02:00

zone_stormwind_city.cpp

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

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

zone_stranglethorn_vale.cpp

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

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

zone_swamp_of_sorrows.cpp

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

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

zone_tirisfal_glades.cpp

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

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

zone_undercity.cpp

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

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

zone_western_plaguelands.cpp

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

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

zone_westfall.cpp

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

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

zone_wetlands.cpp

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

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