From f8aabd670ed171516360ae53a5d8756f61caf3a1 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 24 May 2015 18:47:00 -0700 Subject: [PATCH] Notes about Development in its README.md --- README.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 20dab15454..314526964f 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,21 @@ # Marlin 3D Printer Firmware - Documentation has moved to http://www.marlinfirmware.org + Documentation has moved to [marlinfirmware.org](http://www.marlinfirmware.org). + +## Development Branch + +__Not for production use – use with caution!__ + +The Development branch contains the most up-to-date Marlin code. When reporting any issues, please check to see if they are resolved in this branch first. But let us know if issues exist in tagged releases so that we can document and patch them. + +There is now also an ["Integration" branch](https://github.com/MarlinFirmware/Marlin/tree/Integration) which will be used in development to migrate changes for wider testing from the Development branch on their way to Release. It's a nascent branch, so for now please rely on Development and Release for issues and features under most active discussion. + +For the latest tagged version of Marlin (currently 1.0.2 – January 2015) you should switch to the [Release branch](https://github.com/MarlinFirmware/Marlin/tree/Release). ## Current Status: Bug Fixing -The Marlin development is currently revived. There's a long list of reported issues and pull requests, which we are working on currently. +Marlin development is being accelerated to catch up with a long list of issues. Check the Issues and Pull Requests links on the right to to see what we are currently working on. [![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) [![Travis Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg)](https://travis-ci.org/MarlinFirmware/Marlin) @@ -20,10 +30,10 @@ __Google Hangout:__