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

cba56926

Commit cba56926 authored 10 years ago by Chris Roadfeldt

Downloads
- Plain Diff

Merge remote-tracking branch 'MarlinFirmware/Development' into Development

Conflicts:
	Marlin/Marlin_main.cpp
	Marlin/stepper.cpp

parents 06f767d6 baa67873

Branches

Tags

No related merge requests found

Changes 7

Expand all Show whitespace changes

Inline Side-by-side

Showing

Marlin/Marlin.h 0 additions, 1 deletion

Marlin/Marlin.h
Marlin/Marlin_main.cpp 513 additions, 358 deletions

Marlin/Marlin_main.cpp
Marlin/dogm_lcd_implementation.h 1 addition, 1 deletion

Marlin/dogm_lcd_implementation.h
Marlin/planner.cpp 2 additions, 2 deletions

Marlin/planner.cpp
Marlin/stepper.cpp 76 additions, 39 deletions

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

Marlin/ultralcd.cpp
Marlin/ultralcd_implementation_hitachi_HD44780.h 8 additions, 8 deletions

Marlin/ultralcd_implementation_hitachi_HD44780.h

with 601 additions and 410 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