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

c9465c33

Commit c9465c33 authored 10 years ago by Scott Lahteine

Downloads
- Plain Diff

Merge branch 'thinkyhead-fixup_ramps_boards' into Development

Merge resolving conflicts

parents b12cd1f8 62311961

Branches

Tags

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Marlin/boards.h 2 additions, 3 deletions

Marlin/boards.h
Marlin/pins.h 3 additions, 1 deletion

Marlin/pins.h
Marlin/pins_AZTEEG_X3.h 8 additions, 0 deletions

Marlin/pins_AZTEEG_X3.h
Marlin/pins_AZTEEG_X3_PRO.h 9 additions, 5 deletions

Marlin/pins_AZTEEG_X3_PRO.h
Marlin/pins_BAM_DICE_DUE.h 5 additions, 177 deletions

Marlin/pins_BAM_DICE_DUE.h
Marlin/pins_HEPHESTOS.h 3 additions, 0 deletions

Marlin/pins_HEPHESTOS.h
Marlin/pins_RAMPS_13.h 11 additions, 27 deletions

Marlin/pins_RAMPS_13.h
Marlin/pins_WITBOX.h 3 additions, 0 deletions

Marlin/pins_WITBOX.h

with 44 additions and 213 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