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

Browse Source

Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp

...

This commit is contained in:

Vincent-Michael

2013-06-30 00:36:03 +02:00

parent 83066a2002 718fc5bfc9

commit 676c7341d6

61 changed files with 3376 additions and 1643 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

sql/updates/characters/2013_03_23_00_characters_game_event.sql → sql/updates/characters/2013_06_23_00_characters_game_event.sql