diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-03 16:11:46 +0100 |
| commit | 874ddcb0aede1fb8a3d8077bc11f08203e80b6ba (patch) | |
| tree | 78ec500df7858b45ed4c64d05ef135eaffa400f2 /sql/old | |
| parent | dba602ea1617c42c95fa9703d53f4af0a2b3f35d (diff) | |
| parent | 0db5573d4de436cf14c9f6d113a28800fa278c2c (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
dep/PackageList.txt
src/tools/map_extractor/System.cpp
Diffstat (limited to 'sql/old')
| -rw-r--r-- | sql/old/3.3.5a/2012_08_04_03_world_disables.sql | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/old/3.3.5a/2012_08_04_03_world_disables.sql b/sql/old/3.3.5a/2012_08_04_03_world_disables.sql index 21b55a3e930..e2d1ca1ff6b 100644 --- a/sql/old/3.3.5a/2012_08_04_03_world_disables.sql +++ b/sql/old/3.3.5a/2012_08_04_03_world_disables.sql @@ -1,4 +1,4 @@ -DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9754,9755,10215,11522,12445,12731,12923,13541); +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9754,9755,10215,11522,12445,12731,12923,13541,7797,7869,7870,7906,9378,9611,9880,9881,9908,9909,9949,9950,10088,10181,10214,10454,11197,11226,11577,11874,11937,12485,12600,13123,13210,13317,13990); INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES (1,9754,0,'','','Deprecated quest: '), (1,9755,0,'','','Deprecated quest: '), |