Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

M

marlin-anet-a8
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

740152ee

Commit 740152ee authored 9 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge branch 'Development' into cold_extrude

Latest upstream commits

parents 5914d9d7 7a1aef14

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/example_configurations/Felix/Configuration.h 2 additions, 1 deletion

Marlin/example_configurations/Felix/Configuration.h
Marlin/example_configurations/Felix/Configuration_DUAL.h 2 additions, 1 deletion

Marlin/example_configurations/Felix/Configuration_DUAL.h
Marlin/example_configurations/Hephestos/Configuration.h 1 addition, 0 deletions

Marlin/example_configurations/Hephestos/Configuration.h
Marlin/example_configurations/K8200/Configuration.h 1 addition, 0 deletions

Marlin/example_configurations/K8200/Configuration.h
Marlin/example_configurations/SCARA/Configuration.h 1 addition, 0 deletions

Marlin/example_configurations/SCARA/Configuration.h
Marlin/example_configurations/WITBOX/Configuration.h 1 addition, 0 deletions

Marlin/example_configurations/WITBOX/Configuration.h
Marlin/example_configurations/delta/generic/Configuration.h 2 additions, 1 deletion

Marlin/example_configurations/delta/generic/Configuration.h
Marlin/example_configurations/delta/kossel_mini/Configuration.h 2 additions, 1 deletion

.../example_configurations/delta/kossel_mini/Configuration.h
Marlin/example_configurations/makibox/Configuration.h 1 addition, 0 deletions

Marlin/example_configurations/makibox/Configuration.h
Marlin/example_configurations/tvrrug/Round2/Configuration.h 1 addition, 0 deletions

Marlin/example_configurations/tvrrug/Round2/Configuration.h
Marlin/ultralcd.cpp 7 additions, 4 deletions

Marlin/ultralcd.cpp

with 21 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment