Arjen Hiemstra 98befd69ec Merge branch '15.06' ... * 15.06: Updated name in menu for firmware update Added exception handling to listen thread join Render a transparent ghost of the selection when things are selected. Add changes of 15.05.93 release Make button tooltip text use the dark color from the palette Render the build platform grid as a single sided plane Ignore selection when moving objects due to collision Use the right offset for object collision after Polygon collision was fixed		2015-06-05 10:41:53 +02:00
..
i18n	Update translations to latest version	2015-05-08 12:21:11 +02:00
images	Update splash screen with the correct version	2015-05-07 16:32:53 +02:00
meshes	Add cura-specific resources that were moved from Uranium	2015-05-06 18:03:45 +02:00
qml	add setting for sidebar background color	2015-05-31 07:35:33 -04:00
settings	Merge branch '15.06'	2015-06-03 15:15:43 +02:00
themes/cura	Merge branch '15.06'	2015-06-05 10:41:53 +02:00