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

8742b6bd

Commit 8742b6bd authored 10 years ago by maverikou

Downloads
- Plain Diff

Merge branch 'Development' into panel_one

parents a9e15aa5 e6af82ba

Branches

Tags

Loading

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/boards.txt 1 addition, 1 deletion

ArduinoAddons/Arduino_1.5.x/hardware/marlin/avr/boards.txt
Marlin/Configuration.h 1 addition, 0 deletions

Marlin/Configuration.h
Marlin/Marlin_main.cpp 4 additions, 13 deletions

Marlin/Marlin_main.cpp
Marlin/language_en.h 43 additions, 1 deletion

Marlin/language_en.h
Marlin/thermistortables.h 10 additions, 0 deletions

Marlin/thermistortables.h
Marlin/ultralcd.cpp 696 additions, 878 deletions

Marlin/ultralcd.cpp

with 755 additions and 893 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