diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-30 00:36:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-06-30 00:36:03 +0200 |
| commit | 676c7341d69bc93e95f147608635655fd91c79b9 (patch) | |
| tree | 934a1bae2a8c791aad0bde4fe4acd04ecc7e2bf4 /sql/updates/characters | |
| parent | 83066a200202d7a487d11389e73173c1db0c391e (diff) | |
| parent | 718fc5bfc94bdfa8c94a5ed646f31305ab2b08bd (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
Diffstat (limited to 'sql/updates/characters')
| -rw-r--r-- | sql/updates/characters/2013_06_23_00_characters_game_event.sql (renamed from sql/updates/characters/2013_03_23_00_characters_game_event.sql) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/sql/updates/characters/2013_03_23_00_characters_game_event.sql b/sql/updates/characters/2013_06_23_00_characters_game_event.sql index d8a58832ce1..d8a58832ce1 100644 --- a/sql/updates/characters/2013_03_23_00_characters_game_event.sql +++ b/sql/updates/characters/2013_06_23_00_characters_game_event.sql |