From 0e17a1555675c5e57b8c63baf850dd856a9a54e1 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 1 Sep 2014 04:24:55 +0000 Subject: [PATCH] Merged from revision: 2137 Moved the vanilla Merc Edt files from "Data-1.13" to "Data" folder (thx to Sevenfm) git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2138 4f8fa57e-7814-0410-bad4-adc449f26b7c --- gamedir/{Data-1.13 => Data}/MercEdt/004.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/013.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/014.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/015.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/020.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/031.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/037.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/040.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/149.EDT | Bin gamedir/{Data-1.13 => Data}/MercEdt/167.EDT | Bin 10 files changed, 0 insertions(+), 0 deletions(-) rename gamedir/{Data-1.13 => Data}/MercEdt/004.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/013.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/014.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/015.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/020.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/031.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/037.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/040.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/149.EDT (100%) rename gamedir/{Data-1.13 => Data}/MercEdt/167.EDT (100%) diff --git a/gamedir/Data-1.13/MercEdt/004.EDT b/gamedir/Data/MercEdt/004.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/004.EDT rename to gamedir/Data/MercEdt/004.EDT diff --git a/gamedir/Data-1.13/MercEdt/013.EDT b/gamedir/Data/MercEdt/013.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/013.EDT rename to gamedir/Data/MercEdt/013.EDT diff --git a/gamedir/Data-1.13/MercEdt/014.EDT b/gamedir/Data/MercEdt/014.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/014.EDT rename to gamedir/Data/MercEdt/014.EDT diff --git a/gamedir/Data-1.13/MercEdt/015.EDT b/gamedir/Data/MercEdt/015.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/015.EDT rename to gamedir/Data/MercEdt/015.EDT diff --git a/gamedir/Data-1.13/MercEdt/020.EDT b/gamedir/Data/MercEdt/020.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/020.EDT rename to gamedir/Data/MercEdt/020.EDT diff --git a/gamedir/Data-1.13/MercEdt/031.EDT b/gamedir/Data/MercEdt/031.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/031.EDT rename to gamedir/Data/MercEdt/031.EDT diff --git a/gamedir/Data-1.13/MercEdt/037.EDT b/gamedir/Data/MercEdt/037.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/037.EDT rename to gamedir/Data/MercEdt/037.EDT diff --git a/gamedir/Data-1.13/MercEdt/040.EDT b/gamedir/Data/MercEdt/040.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/040.EDT rename to gamedir/Data/MercEdt/040.EDT diff --git a/gamedir/Data-1.13/MercEdt/149.EDT b/gamedir/Data/MercEdt/149.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/149.EDT rename to gamedir/Data/MercEdt/149.EDT diff --git a/gamedir/Data-1.13/MercEdt/167.EDT b/gamedir/Data/MercEdt/167.EDT similarity index 100% rename from gamedir/Data-1.13/MercEdt/167.EDT rename to gamedir/Data/MercEdt/167.EDT