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

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

Browse source 
Conflicts:
	StaticData/Translations/Master.txt
This commit is contained in:
larsbrubaker 2014-03-17 14:44:38 -07:00
commit 22edd06781
5 changed files with 79 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

8
StaticData/Translations/Master.txt
View file

@ -1372,3 +1372,11 @@ Translated:Finished Print
English:Done Printing
Translated:Done Printing
English:Save As
Translated:Save As
English:Installed Plugins
Translated:Installed Plugins
English:Select a Design Tool
Translated:Select a Design Tool