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

Conflicts:
	src/server/scripts/Commands/cs_reload.cpp

2013-01-03 23:41:36 +01:00

..

CMakeLists.txt

Update copyright note for 2013.

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

cs_account.cpp

Update copyright note for 2013.

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

cs_achievement.cpp

Update copyright note for 2013.

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

cs_ban.cpp

Update copyright note for 2013.

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

cs_bf.cpp

Update more copyright note for 2013.

2013-01-01 15:35:09 +01:00

cs_cast.cpp

Update copyright note for 2013.

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

cs_character.cpp

Merge branch 'master' into 4.3.4

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

cs_cheat.cpp

Merge branch 'master' into 4.3.4

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

cs_debug.cpp

Merge branch 'master' into 4.3.4

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

cs_disable.cpp

Update copyright note for 2013.

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

cs_event.cpp

Update copyright note for 2013.

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

cs_gm.cpp

Merge branch 'master' into 4.3.4

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

cs_go.cpp

Merge branch 'master' into 4.3.4

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

cs_gobject.cpp

Merge branch 'master' into 4.3.4

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

cs_guild.cpp

Merge branch 'master' into 4.3.4

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

cs_honor.cpp

Update copyright note for 2013.

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

cs_instance.cpp

Update copyright note for 2013.

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

cs_learn.cpp

Merge branch 'master' into 4.3.4

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

cs_lfg.cpp

Update copyright note for 2013.

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

cs_list.cpp

Merge branch 'master' into 4.3.4

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

cs_lookup.cpp

Merge branch 'master' into 4.3.4

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

cs_message.cpp

Update copyright note for 2013.

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

cs_misc.cpp

Merge branch 'master' into 4.3.4

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

cs_modify.cpp

Merge branch 'master' into 4.3.4

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

cs_npc.cpp

Merge branch 'master' into 4.3.4

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

cs_quest.cpp

Update copyright note for 2013.

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

cs_reload.cpp

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

2013-01-03 23:41:36 +01:00

cs_reset.cpp

Merge branch 'master' into 4.3.4

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

cs_server.cpp

Update copyright note for 2013.

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

cs_tele.cpp

Update copyright note for 2013.

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

cs_ticket.cpp

Update copyright note for 2013.

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

cs_titles.cpp

Merge branch 'master' into 4.3.4

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

cs_wp.cpp

Merge branch 'master' into 4.3.4

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