From afd0b532ad892e10fecc307d8d055e5e94918148 Mon Sep 17 00:00:00 2001
From: InsanityAutomation <d.menzel@insanityautomation.com>
Date: Wed, 9 May 2018 11:01:53 -0400
Subject: [PATCH] Revert "Merge branch 'TM_CR10' into bugfix-1.1.x"

This reverts commit 1cb2de37de22b5f1a594bc93548b3033d28e84db, reversing
changes made to fd94570a0d2a8c8c186255151a4da6b50ca34875.
---
 Marlin/Configuration.h | 37 -------------------------------------
 Marlin/Version.h       |  8 ++------
 2 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index a5f9160d0b..7d0efcc303 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -90,43 +90,6 @@
  * respecfully request that you retain the unmodified Marlin boot screen.
  */
 
-//#define MeshFast
-//#define MeshStd
-#define MeshFine
-//#define MeshExtreme
-
-//#define BoardRev2
-
-
-#if(!ENABLED(MachineCR10Orig))
-#define CUSTOM_STATUS_SCREEN_IMAGE
-#endif
-
-#if(ENABLED(MachineMini))
-#define CUSTOM_MACHINE_NAME "Mini SuPeR"
-#elif(ENABLED(MachineCR10Orig))
-#define CUSTOM_MACHINE_NAME "SuPeR CR-10"
-#elif(ENABLED(MachineCR10S))
-#define CUSTOM_MACHINE_NAME "300 SuPeR"
-#elif(ENABLED(MachineS4))
-#define CUSTOM_MACHINE_NAME "400 SuPeR"
-#elif(ENABLED(MachineS5))
-#define CUSTOM_MACHINE_NAME "500 SuPeR"
-#endif
-
-#if(ENABLED(MachineMini))
-#define VerChar1 "M"
-#elif(ENABLED(MachineCR10Orig))
-#define VerChar1 "O"
-#elif(ENABLED(MachineCR10S))
-#define VerChar1 "S"
-#elif(ENABLED(MachineS4))
-#define VerChar1 "4"
-#elif(ENABLED(MachineS5))
-#define VerChar1 "5"
-#endif
-
-
 // Enable to show the bitmap in Marlin/_Bootscreen.h on startup.
 //#define SHOW_CUSTOM_BOOTSCREEN
 
diff --git a/Marlin/Version.h b/Marlin/Version.h
index 1af9ff3715..fa3ec9feca 100644
--- a/Marlin/Version.h
+++ b/Marlin/Version.h
@@ -35,9 +35,7 @@
   /**
    * Marlin release version identifier
    */
-
-  #define SHORT_BUILD_VERSION "1.1.8_B9"
-
+  #define SHORT_BUILD_VERSION "bugfix-1.1.x"
 
   /**
    * Verbose version identifier which should contain a reference to the location
@@ -50,9 +48,7 @@
    * here we define this default string as the date where the latest release
    * version was tagged.
    */
-
-  #define STRING_DISTRIBUTION_DATE "2018-05-09"
-
+  #define STRING_DISTRIBUTION_DATE "2018-01-20"
 
   /**
    * Required minimum Configuration.h and Configuration_adv.h file versions.