From 3d3a91905984de66d959f29dd01eb095e5cfb7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= Date: Fri, 20 May 2016 03:30:14 +0100 Subject: [PATCH] Moves the Marlin logo into the buildroot --- README.md | 21 ++++++++---------- .../pixmaps/logo}/Marlin Logo GitHub.png | Bin .../pixmaps/logo}/Marlin Logo LCD High.png | Bin .../pixmaps/logo}/Marlin Logo LCD Low_old.png | Bin .../share/pixmaps/logo}/Marlin Logo.pdf | Bin .../share/pixmaps/logo}/Marlin Logo.png | Bin .../share/pixmaps/logo}/Marlin Logo.svg | 0 .../share/pixmaps/logo}/Marlin Logo_old.ai | 0 .../share/pixmaps/logo}/Marlin Logo_old.cdr | Bin .../share/pixmaps/logo}/Marlin Logo_old.dxf | 0 .../share/pixmaps/logo}/marlinwiki.png | Bin 11 files changed, 9 insertions(+), 12 deletions(-) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo GitHub.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo LCD High.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo LCD Low_old.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo.pdf (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo.png (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo.svg (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo_old.ai (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo_old.cdr (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/Marlin Logo_old.dxf (100%) rename {Documentation/Logo => buildroot/share/pixmaps/logo}/marlinwiki.png (100%) diff --git a/README.md b/README.md index 0ced9403e..5f3a157f0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ # Marlin 3D Printer Firmware - - Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki). + +[![Build Status](https://travis-ci.org/MarlinFirmware/Marlin.svg?branch=RCBugFix)](https://travis-ci.org/MarlinFirmware/Marlin) +[![Coverity Scan Build Status](https://scan.coverity.com/projects/2224/badge.svg)](https://scan.coverity.com/projects/2224) + + + +Additional documentation can be found in [The Marlin Wiki](https://github.com/MarlinFirmware/Marlin/wiki). +Please test this firmware and inform us if it misbehaves in any way, volunteers are standing by! ## Release Candidate -- Marlin 1.1.0-RCBugFix - 27 April 2016 @@ -58,14 +64,7 @@ Proposed patches should be submitted as a Pull Request against the [RCBugFix](ht - Do submit questions and concerns. The "naive" question is often the one we forget to ask. - Follow the proper coding style. Pull requests with styling errors will be delayed. See our [Coding Standards](https://github.com/MarlinFirmware/Marlin/wiki/DNE-Coding-Standards) page for more information. -## Current Status: Testing - -Please test this firmware and inform us if it misbehaves in any way. Volunteers are standing by! - -[![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/MarlinDev.svg)](https://travis-ci.org/MarlinFirmware/MarlinDev) - -##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) +### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin) ## Credits @@ -95,5 +94,3 @@ More features have been added by: Marlin is published under the [GPL license](/LICENSE) because we believe in open development. The GPL comes with both rights and obligations. Whether you use Marlin firmware as the driver for your open or closed-source product, you must keep Marlin open, and you must provide your compatible Marlin source code to end users upon request. The most straightforward way to comply with the Marlin license is to make a fork of Marlin on Github, perform your modifications, and direct users to your modified fork. While we can't prevent the use of this code in products (3D printers, CNC, etc.) that are closed source or crippled by a patent, we would prefer that you choose another firmware or, better yet, make your own. - -[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=ErikZalm&url=https://github.com/MarlinFirmware/Marlin&title=Marlin&language=&tags=github&category=software) \ No newline at end of file diff --git a/Documentation/Logo/Marlin Logo GitHub.png b/buildroot/share/pixmaps/logo/Marlin Logo GitHub.png similarity index 100% rename from Documentation/Logo/Marlin Logo GitHub.png rename to buildroot/share/pixmaps/logo/Marlin Logo GitHub.png diff --git a/Documentation/Logo/Marlin Logo LCD High.png b/buildroot/share/pixmaps/logo/Marlin Logo LCD High.png similarity index 100% rename from Documentation/Logo/Marlin Logo LCD High.png rename to buildroot/share/pixmaps/logo/Marlin Logo LCD High.png diff --git a/Documentation/Logo/Marlin Logo LCD Low_old.png b/buildroot/share/pixmaps/logo/Marlin Logo LCD Low_old.png similarity index 100% rename from Documentation/Logo/Marlin Logo LCD Low_old.png rename to buildroot/share/pixmaps/logo/Marlin Logo LCD Low_old.png diff --git a/Documentation/Logo/Marlin Logo.pdf b/buildroot/share/pixmaps/logo/Marlin Logo.pdf similarity index 100% rename from Documentation/Logo/Marlin Logo.pdf rename to buildroot/share/pixmaps/logo/Marlin Logo.pdf diff --git a/Documentation/Logo/Marlin Logo.png b/buildroot/share/pixmaps/logo/Marlin Logo.png similarity index 100% rename from Documentation/Logo/Marlin Logo.png rename to buildroot/share/pixmaps/logo/Marlin Logo.png diff --git a/Documentation/Logo/Marlin Logo.svg b/buildroot/share/pixmaps/logo/Marlin Logo.svg similarity index 100% rename from Documentation/Logo/Marlin Logo.svg rename to buildroot/share/pixmaps/logo/Marlin Logo.svg diff --git a/Documentation/Logo/Marlin Logo_old.ai b/buildroot/share/pixmaps/logo/Marlin Logo_old.ai similarity index 100% rename from Documentation/Logo/Marlin Logo_old.ai rename to buildroot/share/pixmaps/logo/Marlin Logo_old.ai diff --git a/Documentation/Logo/Marlin Logo_old.cdr b/buildroot/share/pixmaps/logo/Marlin Logo_old.cdr similarity index 100% rename from Documentation/Logo/Marlin Logo_old.cdr rename to buildroot/share/pixmaps/logo/Marlin Logo_old.cdr diff --git a/Documentation/Logo/Marlin Logo_old.dxf b/buildroot/share/pixmaps/logo/Marlin Logo_old.dxf similarity index 100% rename from Documentation/Logo/Marlin Logo_old.dxf rename to buildroot/share/pixmaps/logo/Marlin Logo_old.dxf diff --git a/Documentation/Logo/marlinwiki.png b/buildroot/share/pixmaps/logo/marlinwiki.png similarity index 100% rename from Documentation/Logo/marlinwiki.png rename to buildroot/share/pixmaps/logo/marlinwiki.png