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 release_206

Browse Source
This commit is contained in:
Scott Lahteine
2020-07-26 20:01:40 -05:00
parent 8b637e436c de68b3753f
commit 5e5daf1ff2
1556 changed files with 68526 additions and 19316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#pragma once
@@ -33,7 +33,7 @@
* vendor name, download location, GitHub account, etc.
*/
#ifndef DETAILED_BUILD_VERSION
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION " (GitHub)"
#define DETAILED_BUILD_VERSION SHORT_BUILD_VERSION
#endif
/**
@@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2020-07-09"
#define STRING_DISTRIBUTION_DATE "2020-07-27"
#endif
/**
@@ -52,7 +52,7 @@
* to alert users to major changes.
*/
#define MARLIN_HEX_VERSION 020005
#define MARLIN_HEX_VERSION 020006
#ifndef REQUIRED_CONFIGURATION_H_VERSION
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
#endif
@@ -97,7 +97,7 @@
* documentation about a specific Marlin release. Displayed in the Info Menu.
*/
#ifndef WEBSITE_URL
#define WEBSITE_URL "http://marlinfw.org"
#define WEBSITE_URL "https://marlinfw.org"
#endif
/**