3d-print/anadyr-marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/bugfix-2.0.x' into 2.0.x

Browse Source
This commit is contained in:
Scott Lahteine
2020-02-21 08:37:02 -06:00
parent dd6a7ca197 5d16497bed
commit f9aec2685c
1040 changed files with 5748 additions and 3803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/inc/Version.h
View File

@@ -1,6 +1,6 @@
/**
* Marlin 3D Printer Firmware
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
* Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
*
* Based on Sprinter and grbl.
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-01-31"
#define STRING_DISTRIBUTION_DATE "2020-02-21"
#endif
/**
@@ -52,7 +52,7 @@
* to alert users to major changes.
*/
#define MARLIN_HEX_VERSION 020000
#define MARLIN_HEX_VERSION 020004
#ifndef REQUIRED_CONFIGURATION_H_VERSION
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
#endif