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

b9d7ccf1

Commit b9d7ccf1 authored 11 years ago by Jim Morris

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/Marlin_v1' into delta-configuration

Conflicts:
	Marlin/Marlin_main.cpp

parents fb20ceab e578f988

Branches

Tags

Loading

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Marlin/Configuration.h 1 addition, 0 deletions

Marlin/Configuration.h
Marlin/Configuration_adv.h 25 additions, 0 deletions

Marlin/Configuration_adv.h
Marlin/Marlin.h 5 additions, 1 deletion

Marlin/Marlin.h
Marlin/Marlin_main.cpp 106 additions, 11 deletions

Marlin/Marlin_main.cpp
Marlin/language.h 1537 additions, 1506 deletions

Marlin/language.h
Marlin/pins.h 24 additions, 11 deletions

Marlin/pins.h
Marlin/stepper.cpp 66 additions, 22 deletions

Marlin/stepper.cpp
Marlin/ultralcd.cpp 9 additions, 0 deletions

Marlin/ultralcd.cpp
README.md 2 additions, 0 deletions

README.md

with 1775 additions and 1551 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