3d-gussner 1cc5f5972b Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2 ... # Conflicts: # Firmware/Configuration.h # Firmware/ConfigurationStore.cpp # Firmware/Configuration_adv.h # Firmware/Marlin_main.cpp # Firmware/language_all.cpp # Firmware/language_all.h # Firmware/language_de.h # Firmware/language_en.h # Firmware/stepper.cpp		2017-08-01 15:38:47 +02:00
..
1_75mm_MK1-RAMBo10a-E3Dv6full.h	LIN_ADV	2017-07-02 21:53:08 +02:00
1_75mm_MK1-RAMBo13a-E3Dv6full.h	LIN_ADV	2017-07-02 21:53:08 +02:00
1_75mm_MK2-MultiMaterial-RAMBo10a-E3Dv6full.h	LIN_ADV	2017-07-02 21:53:08 +02:00
1_75mm_MK2-MultiMaterial-RAMBo13a-E3Dv6full.h	LIN_ADV	2017-07-02 21:53:08 +02:00
1_75mm_MK2-RAMBo10a-E3Dv6full.h	Added PID Bed temp	2017-05-20 08:12:08 +02:00
1_75mm_MK2-RAMBo13a-E3Dv6full.h	Merge remote-tracking branch 'refs/remotes/prusa3d/MK2' into MK2	2017-08-01 15:38:47 +02:00