From 5242dc379f0da7b6cd78f702af3944f03dd4fcdf Mon Sep 17 00:00:00 2001 From: RjY Date: Tue, 16 Jun 2009 21:35:16 +0100 Subject: [PATCH] patches: remove patches whose names clash with flats Remove FLAT5_2 and FLOOR7_2 from patches, as the name-clash with flats causes problems in some engines. Neither patch is used in any of the current set of maps, nor referenced in textures/combined.txt, so this should not cause any other problems. Signed-off-by: RjY Signed-off-by: Mike Swanson --- patches/espi/flat5_2.gif | Bin 3164 -> 0 bytes patches/espi/floor7_2.gif | Bin 2205 -> 0 bytes patches/flat5_2.gif | 1 - patches/floor7_2.gif | 1 - 4 files changed, 2 deletions(-) delete mode 100644 patches/espi/flat5_2.gif delete mode 100644 patches/espi/floor7_2.gif delete mode 120000 patches/flat5_2.gif delete mode 120000 patches/floor7_2.gif diff --git a/patches/espi/flat5_2.gif b/patches/espi/flat5_2.gif deleted file mode 100644 index e2f90b8d2670dfbf929a7a9545057ba7fd27c069..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3164 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 GSpNt5x93Fw diff --git a/patches/flat5_2.gif b/patches/flat5_2.gif deleted file mode 120000 index e5279e86..00000000 --- a/patches/flat5_2.gif +++ /dev/null @@ -1 +0,0 @@ -espi/flat5_2.gif \ No newline at end of file diff --git a/patches/floor7_2.gif b/patches/floor7_2.gif deleted file mode 120000 index aa8ec0d5..00000000 --- a/patches/floor7_2.gif +++ /dev/null @@ -1 +0,0 @@ -espi/floor7_2.gif \ No newline at end of file