Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-23 21:38:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/edge' into dev-227-marlin-compat

Browse Source
This commit is contained in:
Alden Hart
2017-02-23 15:36:23 -05:00
parent a42c6a3759 8df3aeada6
commit b9aa5ef493
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -2
View File
@@ -1,10 +1,10 @@
language: c
before_install:
- sudo apt-get update -q
- sudo apt-get update -q
install:
- sudo apt-get install -qq lib32z1
- sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0
script:
- cd ${TRAVIS_BUILD_DIR}/g2core
g2core/g2core_info.h
+1 -1
View File
@@ -21,7 +21,7 @@
#ifndef G2CORE_INFO_H_ONCE
#define G2CORE_INFO_H_ONCE
#define G2CORE_FIRMWARE_BUILD 100.20 // Merged dev-209b-random-pauses to compelte USB changes
#define G2CORE_FIRMWARE_BUILD 100.21 // Merged dev-209b-random-pauses to compelte USB changes (only fix travis-ci from 100.20)
#ifdef GIT_VERSION
#define G2CORE_FIRMWARE_BUILD_STRING GIT_VERSION
#else