nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'Greg/master' into development

Browse source 
Conflicts:
	ConfigurationPage/ConfigurationPage.cs
	StaticData/Translations/Master.txt
This commit is contained in:
larsbrubaker 2014-04-16 18:00:25 -07:00
commit 7549ed97ab
2 changed files with 54 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
StaticData/Translations/Master.txt
View file

@ -1968,9 +1968,12 @@ Translated:The type of support to create inside of parts.
English:Infill Type
Translated:Infill Type
English:Unknown
Translated:Unknown
English:Release Options
Translated:Release Options
English:No items to select. Press 'Add' to select a file to print.
Translated:No items to select. Press 'Add' to select a file to print.
English:Unknown
Translated:Unknown