bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

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

Browse Source
This commit is contained in:
Chris Roadfeldt
2015-03-31 03:07:57 -05:00
parent 17707e7479 21ab44cfa7
commit 45ece5afb1
30 changed files with 3039 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Conditionals.h
View File

@ -260,7 +260,7 @@
#endif
#ifdef ULTIPANEL
#undef SDCARDDETECTINVERTED
#undef SDCARDDETECTINVERTED
#endif
// Power Signal Control Definitions