Tamara Hogenhout 38346dd95f Merge branch '15.06' ... Conflicts: cura/CuraApplication.py		2015-06-10 15:18:45 +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	Highlight Open button when no files are loaded	2015-06-10 14:57:37 +02:00
settings	Merge branch 'master' of https://github.com/Ultimaker/Cura	2015-06-08 13:33:28 +02:00
themes/cura	Merge branch '15.06'	2015-06-10 15:18:45 +02:00