Lipu Fei 6b9d3e8041 Merge pull request #1636 from fieldOfView/fix_recent_dialogs ...

Fix issues with Workspace and Profile Changes dialogs

2017-04-04 14:35:12 +02:00

..

definitions

Merge branch 'master' of github.com:Ultimaker/Cura

2017-04-04 13:31:02 +02:00

extruders

Merge branch '2.5'

2017-03-28 12:55:18 +02:00

i18n

Add Japanese and Korean partial translations

2017-04-04 09:05:12 +02:00

images

T466: Revert the previous commit since it messed up the file rights.

2016-12-23 15:53:15 -05:00

meshes

rename jellybox platform mesh

2017-03-28 12:57:03 -04:00

qml

Merge pull request #1636 from fieldOfView/fix_recent_dialogs

2017-04-04 14:35:12 +02:00

quality

Merge branch 'master' of github.com:Ultimaker/Cura

2017-04-04 13:31:02 +02:00

shaders

WIP OpenGL 4.1 core profile. CURA-3273

2017-01-31 17:05:00 +01:00

themes/cura

Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2

2017-03-07 11:43:17 +01:00

variants

Merge branch 'revise_jellybox_support' of git://github.com/IMADE3D/cura

2017-04-04 13:28:53 +02:00