Nay 91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp

2012-12-27 17:52:11 +00:00

..

CMakeLists.txt

Core/Dungeon Finder: Add debugging commands

2012-10-23 11:44:02 +02:00

cs_account.cpp

Core/Account: Add logs for password change and fail change password

2012-12-18 01:58:12 +01:00

cs_achievement.cpp

Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch

2012-11-27 13:03:12 +01:00

cs_ban.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_bf.cpp

Battlefield/Wintergrasp:

2012-08-20 13:50:49 -04:00

cs_cast.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_character.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_cheat.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_debug.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_disable.cpp

Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch

2012-11-27 13:03:12 +01:00

cs_event.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_gm.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_go.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_gobject.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_guild.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_honor.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_instance.cpp

Core: Remove Player.h dependency from all the possible headers

2012-11-17 05:18:37 +01:00

cs_learn.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_lfg.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_list.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_lookup.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_message.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_misc.cpp

Merge branch 'master' into 4.3.4

2012-11-26 08:43:29 +01:00

cs_modify.cpp

Core/Arenas: Drop old .modify arenapoint command, create a new command to add currency to players.

2012-11-22 01:39:54 +01:00

cs_npc.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_quest.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_reload.cpp

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

2012-12-27 17:52:11 +00:00

cs_reset.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_server.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_tele.cpp

Core/Misc: Reduction of header dependencies - Step II

2012-11-20 12:30:30 +01:00

cs_ticket.cpp

Core/Misc: Reduce header dependencies - Step III

2012-11-20 15:03:56 +01:00

cs_titles.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00

cs_wp.cpp

Merge branch 'master' into 4.3.4

2012-11-20 16:01:31 +01:00