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

c1df713e

Commit c1df713e authored 10 years ago by Bo Herrmannsen

Downloads
- Plain Diff

Merge pull request #1258 from fmalpartida/Development

Merge branch 'SAV-MkI_merge' into Development

parents a5ed3e96 ec33df05

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 7 additions, 5 deletions

Marlin/Configuration.h
Marlin/Marlin_main.cpp 73 additions, 2 deletions

Marlin/Marlin_main.cpp
Marlin/language.h 3 additions, 0 deletions

Marlin/language.h
Marlin/pins.h 18 additions, 6 deletions

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

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 2 additions, 1 deletion

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 106 additions and 17 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