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

15eb5d35

Commit 15eb5d35 authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge branch 'Development' into config_testing

Latest upstream commits

parents 19df9062 9b639b41

Branches

Tags

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 17 additions, 0 deletions

Marlin/Configuration.h
Marlin/ConfigurationStore.cpp 63 additions, 2 deletions

Marlin/ConfigurationStore.cpp
Marlin/Marlin_main.cpp 197 additions, 3 deletions

Marlin/Marlin_main.cpp
Marlin/language_en.h 3 additions, 0 deletions

Marlin/language_en.h
Marlin/mesh_bed_leveling.cpp 20 additions, 0 deletions

Marlin/mesh_bed_leveling.cpp
Marlin/mesh_bed_leveling.h 61 additions, 0 deletions

Marlin/mesh_bed_leveling.h
Marlin/planner.cpp 20 additions, 5 deletions

Marlin/planner.cpp
Marlin/planner.h 6 additions, 5 deletions

Marlin/planner.h
Marlin/temperature.cpp 67 additions, 34 deletions

Marlin/temperature.cpp
Marlin/ultralcd.cpp 88 additions, 1 deletion

Marlin/ultralcd.cpp

with 542 additions and 50 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