-
- Downloads
Merge remote-tracking branch 'upstream/Development' into K8200_2015-04-23_TEST
Conflicts: Marlin/example_configurations/K8200/Configuration.h
No related branches found
No related tags found
Showing
- Documentation/Compilation.md 3 additions, 3 deletionsDocumentation/Compilation.md
- Marlin/Configuration.h 9 additions, 9 deletionsMarlin/Configuration.h
- Marlin/Makefile 2 additions, 2 deletionsMarlin/Makefile
- Marlin/Marlin.h 12 additions, 0 deletionsMarlin/Marlin.h
- Marlin/Marlin_main.cpp 125 additions, 111 deletionsMarlin/Marlin_main.cpp
- Marlin/SanityCheck.h 2 additions, 2 deletionsMarlin/SanityCheck.h
- Marlin/Servo.cpp 2 additions, 2 deletionsMarlin/Servo.cpp
- Marlin/Servo.h 3 additions, 3 deletionsMarlin/Servo.h
- Marlin/blinkm.cpp 2 additions, 2 deletionsMarlin/blinkm.cpp
- Marlin/blinkm.h 1 addition, 1 deletionMarlin/blinkm.h
- Marlin/configuration_store.cpp 2 additions, 2 deletionsMarlin/configuration_store.cpp
- Marlin/configuration_store.h 3 additions, 3 deletionsMarlin/configuration_store.h
- Marlin/configurator/config/Configuration.h 3 additions, 2 deletionsMarlin/configurator/config/Configuration.h
- Marlin/configurator/config/language.h 3 additions, 2 deletionsMarlin/configurator/config/language.h
- Marlin/dogm_bitmaps.h 0 additions, 0 deletionsMarlin/dogm_bitmaps.h
- Marlin/dogm_lcd_implementation.h 1 addition, 1 deletionMarlin/dogm_lcd_implementation.h
- Marlin/example_configurations/Felix/Configuration.h 4 additions, 3 deletionsMarlin/example_configurations/Felix/Configuration.h
- Marlin/example_configurations/Felix/Configuration_DUAL.h 3 additions, 2 deletionsMarlin/example_configurations/Felix/Configuration_DUAL.h
- Marlin/example_configurations/Hephestos/Configuration.h 4 additions, 3 deletionsMarlin/example_configurations/Hephestos/Configuration.h
- Marlin/example_configurations/K8200/Configuration.h 4 additions, 3 deletionsMarlin/example_configurations/K8200/Configuration.h
Loading
Please register or sign in to comment