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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/ItemHandler.cpp

2014-01-18 01:01:11 +01:00

..

CMakeLists.txt

Update copyright note for 2014.

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

cs_account.cpp

Update copyright note for 2014.

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

cs_achievement.cpp

Update copyright note for 2014.

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

cs_arena.cpp

Update copyright note for 2014.

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

cs_ban.cpp

Show Kick, Mute and Ban in world

2014-01-17 12:23:36 +01:00

cs_bf.cpp

Update copyright note for 2014.

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

cs_cast.cpp

Update copyright note for 2014.

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

cs_character.cpp

Merge branch 'master' into 4.3.4

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

cs_cheat.cpp

Merge branch 'master' into 4.3.4

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

cs_debug.cpp

Merge branch 'master' into 4.3.4

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

cs_deserter.cpp

Update copyright note for 2014.

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

cs_disable.cpp

Update copyright note for 2014.

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

cs_event.cpp

Update copyright note for 2014.

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

cs_gm.cpp

Merge branch 'master' into 4.3.4

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

cs_go.cpp

Merge branch 'master' into 4.3.4

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

cs_gobject.cpp

Merge branch 'master' into 4.3.4

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

cs_group.cpp

Update copyright note for 2014.

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

cs_guild.cpp

Merge branch 'master' into 4.3.4

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

cs_honor.cpp

Update copyright note for 2014.

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

cs_instance.cpp

Update copyright note for 2014.

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

cs_learn.cpp

Merge branch 'master' into 4.3.4

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

cs_lfg.cpp

Update copyright note for 2014.

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

cs_list.cpp

Merge branch 'master' into 4.3.4

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

cs_lookup.cpp

Merge branch 'master' into 4.3.4

2014-01-11 17:26:22 +00: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-01-18 01:01:11 +01:00

cs_mmaps.cpp

Misc: missing changes after merge

2014-01-14 12:38:19 +01:00

cs_modify.cpp

Merge branch 'master' into 4.3.4

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

cs_npc.cpp

Merge branch 'master' into 4.3.4

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

cs_pet.cpp

Update copyright note for 2014.

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

cs_quest.cpp

Update copyright note for 2014.

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

cs_rbac.cpp

Update copyright note for 2014.

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

cs_reload.cpp

Merge branch 'master' into 4.3.4

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

cs_reset.cpp

Merge branch 'master' into 4.3.4

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

cs_send.cpp

Update copyright note for 2014.

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

cs_server.cpp

Update copyright note for 2014.

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

cs_tele.cpp

Update copyright note for 2014.

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

cs_ticket.cpp

Update copyright note for 2014.

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

cs_titles.cpp

Merge branch 'master' into 4.3.4

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

cs_wp.cpp

Merge branch 'master' into 4.3.4

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