mattercontrol/StaticData
Lars Brubaker 352eb792f1 Merge branch 'smash_1.7.1' into design_tools
# Conflicts:
#	PartPreviewWindow/View3D/View3DWidget.cs
#	SlicerConfiguration/SliceSettingsWidget.cs
#	SlicerConfiguration/SlicingQueue.cs
#	StaticData/SliceSettings/Properties.json
2017-05-19 14:57:04 -07:00
..
Drivers Including Ghostscript to allow for loading of PDFs 2016-01-22 13:40:39 -08:00
Fonts Pun in a braille font 2015-09-15 17:45:48 -07:00
Icons Add demo image 2017-03-28 11:05:51 -07:00
Images Improved theme colors 2017-02-15 12:14:36 -08:00
OEMSettings All new 1.7.1 changes 2017-05-19 14:39:57 -07:00
PrinterSettings/JumpStart/V1 Design tools 2017-03-15 16:29:56 -07:00
Profiles Fixed printers 2016-12-21 13:04:55 -08:00
SliceSettings Merge branch 'smash_1.7.1' into design_tools 2017-05-19 14:57:04 -07:00
Sounds Commit of the code 2014-01-29 19:09:30 -08:00
Translations All new 1.7.1 changes 2017-05-19 14:39:57 -07:00
application.ico Added some test code. 2014-04-17 12:21:51 -07:00
BuildInfo.txt Make sure profilePath exists before loading it. 2016-07-07 17:06:23 -07:00
CuraEngine License.txt Commit of the code 2014-01-29 19:09:30 -08:00
MatterControl EULA.txt Cleaned up formating 2016-07-28 17:41:49 -07:00
mc.ico Commit of the code 2014-01-29 19:09:30 -08:00
MHDude.png Commit of the code 2014-01-29 19:09:30 -08:00
PartSheetLogo.png Commit of the code 2014-01-29 19:09:30 -08:00