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

f1d3d152

Commit f1d3d152 authored 10 years ago by AnHardt

Downloads
- Plain Diff

Merge branch 'optimize_menu_code' of https://github.com/thinkyhead/Marlin into beautify

Conflicts:
	Marlin/dogm_lcd_implementation.h

solved merge conflict.

parents fa889cd6 7279e4f8

Branches

Tags

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/SdBaseFile.h 2 additions, 2 deletions

Marlin/SdBaseFile.h
Marlin/dogm_lcd_implementation.h 54 additions, 78 deletions

Marlin/dogm_lcd_implementation.h
Marlin/ultralcd.cpp 64 additions, 44 deletions

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 89 additions, 199 deletions

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 209 additions and 323 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