From b2c781a026b35f799dcd43b182ea6e36c558be39 Mon Sep 17 00:00:00 2001 From: Marcio Teixeira Date: Wed, 21 Jun 2017 09:58:00 -0600 Subject: [PATCH] Updated README.md --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 9d075209b..f6ac1b556 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,22 @@ Documentation has moved to [marlinfirmware.org](http://www.marlinfirmware.org). +## Recent updates: + +_June 21, 2017_: A new "oliveoil-universal" branch supersedes the following branches: + + * oliveoil + * oliveoil-flexy + * oliveoil-dually + * oliveoil-moar + +Specific configuration for individual LulzBot toolheads are now brought together in the "Configuration_LulzBot.h" file. All variants are build at once with the +"build-all-taz-toolheads.sh" script. + +This new branch generates identical binaries for the 1.0.2.22 release as the non-universal +branches, so at this time there is no need to switch over. All future oliveoil +development will take place on this universal branch. + ## Release Branch The Release branch contains the latest tagged version of Marlin (currently 1.0.2-1 – January 2015). It also includes a version 1.0.1 (December 2014). Any version of Marlin before 1.0.1 (when we started tagging versions) can be collectively referred to as Marlin 1.0.0.