From bbd29a4469b7655fd1103d2fd623874cb7440ab4 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 --- Data-1.13/MercEdt/031.EDT | Bin 56160 -> 0 bytes Data-1.13/MercEdt/167.EDT | Bin 56160 -> 0 bytes {Data-1.13 => Data}/MercEdt/004.EDT | Bin {Data-1.13 => Data}/MercEdt/013.EDT | Bin {Data-1.13 => Data}/MercEdt/014.EDT | Bin {Data-1.13 => Data}/MercEdt/015.EDT | Bin {Data-1.13 => Data}/MercEdt/020.EDT | Bin Data/MercEdt/031.EDT | Bin 56160 -> 56160 bytes {Data-1.13 => Data}/MercEdt/037.EDT | Bin {Data-1.13 => Data}/MercEdt/040.EDT | Bin {Data-1.13 => Data}/MercEdt/149.EDT | Bin Data/MercEdt/167.EDT | Bin 68640 -> 56160 bytes {Data-1.13 => Data}/MercEdt/169.EDT | Bin 13 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Data-1.13/MercEdt/031.EDT delete mode 100644 Data-1.13/MercEdt/167.EDT rename {Data-1.13 => Data}/MercEdt/004.EDT (100%) rename {Data-1.13 => Data}/MercEdt/013.EDT (100%) rename {Data-1.13 => Data}/MercEdt/014.EDT (100%) rename {Data-1.13 => Data}/MercEdt/015.EDT (100%) rename {Data-1.13 => Data}/MercEdt/020.EDT (100%) rename {Data-1.13 => Data}/MercEdt/037.EDT (100%) rename {Data-1.13 => Data}/MercEdt/040.EDT (100%) rename {Data-1.13 => Data}/MercEdt/149.EDT (100%) rename {Data-1.13 => Data}/MercEdt/169.EDT (100%) diff --git a/Data-1.13/MercEdt/031.EDT b/Data-1.13/MercEdt/031.EDT deleted file mode 100644 index 2a9285f27344dcdb05a196eff119a8e4a1370fc1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 56160 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 O&e(juo7uj8clkd6=MlgF diff --git a/Data-1.13/MercEdt/004.EDT b/Data/MercEdt/004.EDT similarity index 100% rename from Data-1.13/MercEdt/004.EDT rename to Data/MercEdt/004.EDT diff --git a/Data-1.13/MercEdt/013.EDT b/Data/MercEdt/013.EDT similarity index 100% rename from Data-1.13/MercEdt/013.EDT rename to Data/MercEdt/013.EDT diff --git a/Data-1.13/MercEdt/014.EDT b/Data/MercEdt/014.EDT similarity index 100% rename from Data-1.13/MercEdt/014.EDT rename to Data/MercEdt/014.EDT diff --git a/Data-1.13/MercEdt/015.EDT b/Data/MercEdt/015.EDT similarity index 100% rename from Data-1.13/MercEdt/015.EDT rename to Data/MercEdt/015.EDT diff --git a/Data-1.13/MercEdt/020.EDT b/Data/MercEdt/020.EDT similarity index 100% rename from Data-1.13/MercEdt/020.EDT rename to Data/MercEdt/020.EDT diff --git a/Data/MercEdt/031.EDT b/Data/MercEdt/031.EDT index a7a0fd9e61a5e607346a2fc2a0c54d2e8614633e..2a9285f27344dcdb05a196eff119a8e4a1370fc1 100644 GIT binary patch delta 566 zcmdT<*NllRqIhVov@zUq<>-|KMhzH=Le~s8t080!;Nzp*+WT_=LTfTY9VxRbQ%3 zW^|TOcc9gX(^F0~8fwic@q}IHuerjh`QT~2+tqy*GorQ6W>@X@oPEdF9r9sb=(%Ga O>|*mD%a`i)e)|^?-Fo!^ delta 83 zcmaE`jrqYg<_$W$jP{$gc`q|=;#c6^d?CJob)tg7<^zgaAn})aR~a`SFnFK`mvBgR TaEEagD{SJ2u{R$$wm<{`Vvr$~ diff --git a/Data-1.13/MercEdt/037.EDT b/Data/MercEdt/037.EDT similarity index 100% rename from Data-1.13/MercEdt/037.EDT rename to Data/MercEdt/037.EDT diff --git a/Data-1.13/MercEdt/040.EDT b/Data/MercEdt/040.EDT similarity index 100% rename from Data-1.13/MercEdt/040.EDT rename to Data/MercEdt/040.EDT diff --git a/Data-1.13/MercEdt/149.EDT b/Data/MercEdt/149.EDT similarity index 100% rename from Data-1.13/MercEdt/149.EDT rename to Data/MercEdt/149.EDT diff --git a/Data/MercEdt/167.EDT b/Data/MercEdt/167.EDT index dd7dcf842838ab822d3cb3dc401ea9c8ca0f9bf4..20bdc444fc621632450a8e1dc5c162ed654d922e 100644 GIT binary patch delta 404 zcmZ25gXO_C<_!XH67&3u$E)Xg(_%UQL|}fCf`JI0vo1N0dvRI-4fkOB4`ENoz*QVf*K0O~JgPy)((A%zqyR1|=riE0Wc Ww9|m0p2d*PkPZx&TEb%7 diff --git a/Data-1.13/MercEdt/169.EDT b/Data/MercEdt/169.EDT similarity index 100% rename from Data-1.13/MercEdt/169.EDT rename to Data/MercEdt/169.EDT