Tim Kuipers a144a51da4 Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura ... This is a manual merge. I did a checkout on specific files from another branch That branch branched from 2.1 and I cherry-picked all commits which were on master but not on 2.1 manually by reviewing each of them This way of merging bypasses all problems we had with the standard merges from 2.1 into master CURA-1349		2016-04-11 18:50:41 +02:00
..
i18n	Update template files	2016-04-01 16:46:06 +02:00
images	Change splash-screen so it does not say "developer version", pending a release "real soon now"	2016-04-05 22:28:52 +02:00
machines	Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura	2016-04-11 18:50:41 +02:00
meshes	Rename inventor_platform.stl to match the rest	2016-03-03 17:21:00 +01:00
profiles	Manual Merge branch 'fix_setting_issues_2.1_merge' of https://github.com/Ultimaker/Cura	2016-04-11 18:50:41 +02:00
qml	Fix color of some texts on Linux with dark theme	2016-04-07 18:57:11 +02:00
shaders	Add SolidView plugin, which is what used to be Uranium's MeshView	2015-12-14 13:56:32 +01:00
themes/cura	Merge branch '2.1'	2016-04-04 18:49:09 +02:00