diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-31 00:10:17 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-31 00:10:17 +0100 |
| commit | f5fd7bad69c04352f5e367b8aca2035e0eff57d9 (patch) | |
| tree | b8017b150947261f628d25a94ef3d3430b28a69f /sql | |
| parent | 15e42ac797099361fe7d85436cdc90ddbc5d1a67 (diff) | |
| parent | 754418a8de569c2cb4d28e9dde5cf257490b73b9 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
sql/base/auth_database.sql
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/base/auth_database.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql index b7ee9584799..fe1e68070d5 100644 --- a/sql/base/auth_database.sql +++ b/sql/base/auth_database.sql @@ -213,7 +213,7 @@ CREATE TABLE `realmlist` ( LOCK TABLES `realmlist` WRITE; /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */; -INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1',8085,1,0,1,0,0,15595); +INSERT INTO `realmlist` VALUES (1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,1,0,1,0,0,15595); /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */; UNLOCK TABLES; |