Ghostkeeper 0684cee681 Merge branch '2.1' ... Conflicts: resources/machines/fdmprinter.json resources/machines/innovo-inventor.json resources/profiles/general/High+Quality.cfg resources/profiles/general/Low+Quality.cfg resources/profiles/general/Normal+Quality.cfg resources/profiles/general/Ulti+Quality.cfg resources/profiles/ultimaker2+/pla_0.4_high.curaprofile		2016-04-04 18:49:09 +02:00
..
fonts	Use Open Sans font instead of Proxima Nova	2016-03-01 17:22:25 +01:00
icons	Merge branch '2.1'	2016-03-17 15:24:00 +01:00
images	Add 'resources/themes/cura/' from commit 'ff0b05acb2'	2015-04-30 13:28:11 +02:00
styles.qml	Add styling for disabled controls	2016-03-14 15:58:25 +01:00
theme.json	Merge branch '2.1'	2016-04-04 18:49:09 +02:00