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

3d4ee6c8

Commit 3d4ee6c8 authored 10 years ago by MagoKimbra

Downloads
- Plain Diff

Merge branch '4th-extruders' of https://github.com/MagoKimbra/Marlin into 4th-extruders

Conflicts:
	Marlin/temperature.cpp

parents 986e723e 0ebf8960

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 13 additions, 17 deletions

Marlin/Configuration.h
Marlin/temperature.cpp 23 additions, 0 deletions

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

Marlin/ultralcd.h

with 39 additions and 20 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