Ghostkeeper 66f5b236d6 Merge branch '2.6'		2017-06-15 09:54:19 +02:00
..
definitions	Merge branch '2.6'	2017-06-12 09:23:41 +02:00
extruders	Merge branch 'maukcc-master'	2017-05-08 16:45:02 +02:00
i18n	updated strings for cura 2.6	2017-06-14 10:47:40 -03:00
images	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
meshes	Merge pull request #1866 from moritzmair/master	2017-05-30 10:59:31 +02:00
qml	Merge branch '2.6'	2017-06-15 09:54:19 +02:00
quality	Merge branch '2.6'	2017-06-09 10:41:17 +02:00
shaders	WIP OpenGL 4.1 core profile. CURA-3273	2017-01-31 17:05:00 +01:00
themes/cura	Use "button" style for material info button	2017-05-29 18:06:42 +02:00
variants	Remove redundant travel avoid distance settings	2017-05-19 15:57:53 +02:00