 Cylindric
|
3cc7626d1f
|
Merge branch 'Marlin_v1' of https://github.com/ErikZalm/Marlin into update_menu_plan
|
2014-02-20 14:12:10 +00:00 |
|
|
Cylindric
|
8f0cee2a14
|
Various typo fixes - only in comments, no code changes.
|
2014-02-17 10:58:36 +00:00 |
|
|
Cylindric
|
08263ae66e
|
Merge branch 'Marlin_v1' into typofixes_1
|
2014-02-17 10:28:20 +00:00 |
|
|
Mark Hanford
|
ab0d3c4fb3
|
Various typo fixes - only in comments, no code changes.
|
2014-02-14 11:48:24 +00:00 |
|
|
Cylindric
|
363dc2f0e8
|
Merge branch 'Marlin_v1' into update_menu_plan
|
2014-02-12 00:51:16 +00:00 |
|
|
Mark Hanford
|
0778f5f028
|
Add missing entries to the new Aragonian language.
|
2014-02-11 14:40:53 +00:00 |
|
|
Mark Hanford
|
54bab3e0d0
|
Merge branch 'Marlin_v1' into localisation
Conflicts:
Marlin/language.h
|
2014-02-11 14:35:28 +00:00 |
|
|
Mark Hanford
|
bdd0211aeb
|
Move strings in ultralcd.cpp into language.h.
|
2014-02-11 13:54:43 +00:00 |
|
|
Cylindric
|
1781031f2d
|
Update LCD Menu Tree with current options, based on ultralcd.cpp and language.h.
|
2014-02-07 01:52:44 +00:00 |
|