 Neil Darlow
|
64139f5e5a
|
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-12-04 21:09:03 +00:00 |
|
|
Neil Darlow
|
b81021f475
|
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-10-21 12:06:56 +01:00 |
|
|
Neil Darlow
|
6c5a460e65
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-10-05 12:54:54 +01:00 |
|
|
Neil Darlow
|
1632e5e38a
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-09-04 12:21:35 +01:00 |
|
|
Neil Darlow
|
3cd7dbcc45
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-07-30 13:01:52 +01:00 |
|
|
Neil Darlow
|
3f2c771d90
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-07-07 18:17:15 +01:00 |
|
|
Neil Darlow
|
6e3406d228
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-07-01 10:27:39 +01:00 |
|
|
Neil Darlow
|
9d11b70436
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-06-07 20:48:25 +01:00 |
|
|
neildarlow
|
efb6d61413
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-05-24 13:08:58 +01:00 |
|
|
Neil Darlow
|
e541323741
|
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-05-09 15:02:50 +01:00 |
|
|
Neil Darlow
|
6adbdf42e0
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-04-21 15:10:57 +01:00 |
|
|
neildarlow
|
95ad6ec9a1
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-04-12 22:20:45 +01:00 |
|
|
Neil Darlow
|
73b380d8d2
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-04-06 19:15:29 +01:00 |
|
|
Neil Darlow
|
89f78b0b80
|
Allow use of either SD Card slot when LCD Panel is configured.
Preference is for Controller SD slot before LCD Panel slot when both are occupied.
|
2014-03-27 17:02:17 +00:00 |
|
|
neildarlow
|
bbe8fbe13d
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-03-21 18:27:14 +00:00 |
|
|
neildarlow
|
af8be9013b
|
Merge branch 'lcd_detected' of https://github.com/whosawhatsis/Marlin into Marlin_v1
|
2014-03-15 07:24:47 +00:00 |
|
|
neildarlow
|
5a332df47e
|
Merge https://github.com/ErikZalm/Marlin into Marlin_v1
|
2014-03-06 20:56:44 +00:00 |
|
|
neildarlow
|
7325d7102e
|
Activate LiquidTWI2 device detection and space-pad LCD status line.
|
2014-03-03 21:01:27 +00:00 |
|