Tim Kuipers 11f7f521c9 Merge branch '2.1'		2015-12-08 16:15:43 +01:00
..
i18n	Update translations with the 15.10 versions	2015-11-17 11:55:39 +01:00
images	Display the version number in the splash screen	2015-11-17 10:11:41 +01:00
machines	Merge branch '2.1'	2015-12-08 16:15:43 +01:00
meshes	Renaming of BQ printers meshes	2015-10-27 12:06:21 +01:00
profiles	Update default profiles with values as supplied by Paul	2015-12-04 17:12:27 +01:00
qml	Fix variant selection dropdown in sidebar so it actually selects a variant	2015-12-04 16:46:45 +01:00
settings	Merge pull request #301 from innovo3d/patch-1	2015-10-01 12:18:48 +02:00
themes/cura	Merge branch '15.10'	2015-11-13 11:31:29 +01:00