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

4e448b70

Commit 4e448b70 authored 12 years ago by Dirk Eichel

Downloads
- Plain Diff

Merged fetched files from Marlin_v1 branch

Pull requests: #414 #433 #432 #428

parents 6c66cae6 fa58be3c

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 3 additions, 1 deletion

Marlin/Configuration.h
Marlin/Marlin_main.cpp 34 additions, 5 deletions

Marlin/Marlin_main.cpp
Marlin/language.h 7 additions, 0 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 268 additions and 63 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