aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDDuarte <dnpd.dd@gmail.com>2016-10-16 20:41:50 +0100
committerDDuarte <dnpd.dd@gmail.com>2016-10-16 20:42:14 +0100
commitda2026e764e3d3b242b9ae480b8a9ba28e3c8d63 (patch)
treec8c26fe19353ad724973f155b2a1b78ea200c11d /contrib
parente5f21a8478d269d61bb2ced9968e8781e781d663 (diff)
Yet more 6.x -> master renames
Diffstat (limited to 'contrib')
-rw-r--r--contrib/merge_updates_unix.sh4
-rw-r--r--contrib/merge_updates_windows.bat4
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/merge_updates_unix.sh b/contrib/merge_updates_unix.sh
index 42499e68932..355289d8588 100644
--- a/contrib/merge_updates_unix.sh
+++ b/contrib/merge_updates_unix.sh
@@ -1,2 +1,2 @@
-cat ../sql/updates/world/*.sql > world_update.sql
-cat ../sql/updates/hotfixes/*.sql > hotfixes_update.sql
+cat ../sql/updates/world/master/*.sql > world_update.sql
+cat ../sql/updates/hotfixes/master/*.sql > hotfixes_update.sql
diff --git a/contrib/merge_updates_windows.bat b/contrib/merge_updates_windows.bat
index f70bd1bcb5b..9539a542ea5 100644
--- a/contrib/merge_updates_windows.bat
+++ b/contrib/merge_updates_windows.bat
@@ -1,2 +1,2 @@
-copy /a ..\sql\updates\world\*.sql /b world_updates.sql
-copy /a ..\sql\updates\hotfixes\*.sql /b hotfixes_updates.sql
+copy /a ..\sql\updates\world\master\*.sql /b world_updates.sql
+copy /a ..\sql\updates\hotfixes\master\*.sql /b hotfixes_updates.sql