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

..

CMakeLists.txt

Update copyright note for 2014.

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

cs_account.cpp

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

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

cs_achievement.cpp

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

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

cs_arena.cpp

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

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

cs_ban.cpp

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

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

cs_bf.cpp

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

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

cs_cast.cpp

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

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

cs_character.cpp

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

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

cs_cheat.cpp

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

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

cs_debug.cpp

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

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

cs_deserter.cpp

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

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

cs_disable.cpp

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

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

cs_event.cpp

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

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

cs_gm.cpp

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

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

cs_go.cpp

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

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

cs_gobject.cpp

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

2014-04-19 19:57:46 +02:00

cs_group.cpp

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

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

cs_guild.cpp

Merge branch 'master' into 4.3.4

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

cs_honor.cpp

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

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

cs_instance.cpp

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

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

cs_learn.cpp

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

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

cs_lfg.cpp

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

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

cs_list.cpp

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

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

cs_lookup.cpp

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

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

cs_message.cpp

Update copyright note for 2014.

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

cs_misc.cpp

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

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

cs_mmaps.cpp

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

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

cs_modify.cpp

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

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

cs_npc.cpp

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

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

cs_pet.cpp

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

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

cs_quest.cpp

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

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

cs_rbac.cpp

Correct display of output for .rbac account list command. (thanks Spp-)

2014-04-23 08:05:29 -04:00

cs_reload.cpp

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

2014-04-28 09:42:20 +02:00

cs_reset.cpp

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

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

cs_send.cpp

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

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

cs_server.cpp

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

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

cs_tele.cpp

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

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

cs_ticket.cpp

Update copyright note for 2014.

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

cs_titles.cpp

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

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

cs_wp.cpp

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

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