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

Merge remote-tracking branch 'origin/utf-kanji' into tm-utf-minus-kanji

Browse Source 
Conflicts:
	Marlin/language.h
Conflict cleaned
This commit is contained in:
AnHardt
2015-03-16 17:13:49 +01:00
parent cbe4496123 e38dd5f030
commit 00b162a993
44 changed files with 2446 additions and 1215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -10,6 +10,7 @@
* [Auto Bed Leveling](/Documentation/BedLeveling.md)
* [Filament Sensor](/Documentation/FilamentSensor.md)
* [Ramps Servo Power](/Documentation/RampsServoPower.md)
* [LCD Language - Font - System](Documentation/LCDLanguageFont.md)
##### [RepRap.org Wiki Page](http://reprap.org/wiki/Marlin)