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

fa58be3c

Commit fa58be3c authored 12 years ago by Dirk Eichel

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/Marlin_v1' into Marlin_v1

parents a0e41c09 9f2862ce

No related branches found

No related tags found

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 3 additions, 1 deletion

Marlin/Configuration.h
Marlin/Marlin_main.cpp 2155 additions, 2126 deletions

Marlin/Marlin_main.cpp
Marlin/language.h 4 additions, 2 deletions

Marlin/language.h
Marlin/pins.h 87 additions, 0 deletions

Marlin/pins.h
Marlin/temperature.cpp 2 additions, 2 deletions

Marlin/temperature.cpp
Marlin/thermistortables.h 135 additions, 55 deletions

Marlin/thermistortables.h

with 2386 additions and 2186 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