 bissen21
|
f7eac586fb
|
Merge tag '2.0.7.2' into master
|
2020-11-17 18:53:19 -06:00 |
|
|
bissen21
|
09beed85c2
|
Merge tag '2.0.7' of https://github.com/MarlinFirmware/Marlin into master
|
2020-10-06 19:39:16 -05:00 |
|
|
bissen21
|
4f755578b1
|
Merge tag '2.0.6.1' of https://github.com/MarlinFirmware/Marlin into master
|
2020-10-06 19:33:37 -05:00 |
|
|
bissen21
|
17e830b04b
|
Merge with upstream branch 2.0.5.3
|
2020-10-03 16:48:48 -05:00 |
|
|
bissen21
|
192498e905
|
Merge tag '2.0.5.3'
# Conflicts:
# .gitignore
# Marlin/Configuration.h
# Marlin/Configuration_adv.h
# Marlin/src/HAL/LPC1768/upload_extra_script.py
# Marlin/src/HAL/STM32F1/build_flags.py
# buildroot/bin/generate_version
# buildroot/bin/opt_add
# buildroot/bin/opt_disable
# buildroot/bin/opt_enable
# buildroot/bin/opt_set
# buildroot/bin/pins_set
# buildroot/bin/restore_configs
# buildroot/bin/use_example_configs
# buildroot/share/PlatformIO/ldscripts/mks_robin_mini.ld
# buildroot/share/PlatformIO/ldscripts/mks_robin_nano.ld
# buildroot/share/PlatformIO/scripts/mks_robin_mini.py
# buildroot/share/PlatformIO/scripts/mks_robin_nano.py
# buildroot/share/fonts/genallfont.sh
# buildroot/share/fonts/get-bdf2u8g.sh
# buildroot/share/fonts/uxggenpages.sh
# buildroot/share/git/README.md
# buildroot/share/git/firstpush
# buildroot/share/git/ghpc
# buildroot/share/git/ghtp
# buildroot/share/git/mfadd
# buildroot/share/git/mfclean
# buildroot/share/git/mfdoc
# buildroot/share/git/mffp
# buildroot/share/git/mfhelp
# buildroot/share/git/mfinfo
# buildroot/share/git/mfinit
# buildroot/share/git/mfnew
# buildroot/share/git/mfpr
# buildroot/share/git/mfpub
# buildroot/share/git/mfqp
# buildroot/share/git/mfrb
# buildroot/share/git/mftest
# buildroot/share/git/mfup
# buildroot/share/scripts/createSpeedLookupTable.py
# buildroot/share/scripts/createTemperatureLookupMarlin.py
# buildroot/share/scripts/findMissingTranslations.sh
# buildroot/share/scripts/g29_auto.py
# buildroot/share/scripts/pinsformat.js
# buildroot/share/tests/DUE-tests
# buildroot/share/tests/LPC1768-tests
# buildroot/share/tests/LPC1769-tests
# buildroot/share/tests/STM32F103RE-tests
# buildroot/share/tests/STM32F103VE_longer-tests
# buildroot/share/tests/STM32F407VE_black-tests
# buildroot/share/tests/esp32-tests
# buildroot/share/tests/linux_native-tests
# buildroot/share/tests/mega2560-tests
# buildroot/share/tests/run_tests
# buildroot/share/tests/teensy31-tests
# buildroot/share/tests/teensy35-tests
# config/README.md
# platformio.ini
|
2020-10-03 16:47:31 -05:00 |
|
|
bissen21
|
22089da821
|
intitial commit
|
2020-10-03 15:44:10 -05:00 |
|