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

69dc411a

Commit 69dc411a authored 10 years ago by Steffen Vogel

Downloads
- Plain Diff

Merge branch 'Development' of github.com:MarlinFirmware/Marlin into LogoLCD

Conflicts:
	Marlin/dogm_lcd_implementation.h

parents 905aab3b d7439436

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_adv.h 7 additions, 1 deletion

Marlin/Configuration_adv.h
Marlin/Marlin_main.cpp 14 additions, 10 deletions

Marlin/Marlin_main.cpp
Marlin/dogm_lcd_implementation.h 158 additions, 189 deletions

Marlin/dogm_lcd_implementation.h
Marlin/ultralcd.cpp 8 additions, 7 deletions

Marlin/ultralcd.cpp
Marlin/ultralcd.h 1 addition, 1 deletion

Marlin/ultralcd.h
README.md 2 additions, 2 deletions

README.md

with 190 additions and 210 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