Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1

2012-05-19 17:38:46 +02:00
parent 279d00da9f e31bef31ad
commit 7244aa7eb7
9 changed files with 96 additions and 74 deletions
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@ -26,6 +26,7 @@
 // Gen6 = 5
 // Gen6 deluxe = 51
 // Sanguinololu 1.2 and above = 62
+// Melzi = 63
 // Ultimaker = 7
 // Teensylu = 8
 // Gen3+ =9