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

0d81abe1

Commit 0d81abe1 authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge branch 'Development' into config_testing

Latest upstream commits

parents 4fbb8056 e2576b1a

Branches

Tags

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/Logo/marlinwiki.png 0 additions, 0 deletions

Documentation/Logo/marlinwiki.png
Marlin/Marlin_main.cpp 15 additions, 64 deletions

Marlin/Marlin_main.cpp
Marlin/example_configurations/Felix/Configuration.h 0 additions, 1 deletion

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

Marlin/example_configurations/Felix/Configuration_DUAL.h
Marlin/temperature.cpp 46 additions, 41 deletions

Marlin/temperature.cpp
Marlin/ultralcd.cpp 3 additions, 3 deletions

Marlin/ultralcd.cpp

with 64 additions and 110 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