Cura/resources
fieldOfView ede065a3e1 Merge branch '3.6' into bb-3.6
# Conflicts:
#	plugins/ChangeLogPlugin/ChangeLog.txt
#	plugins/USBPrinting/USBPrinterOutputDeviceManager.py
#	resources/qml/Menus/SettingVisibilityPresetsMenu.qml
2018-11-13 15:25:24 +01:00
..
bundled_packages Change the Ultimaker author_id to UltimakerPackages. Apparently this is 2018-11-09 17:18:01 +01:00
definitions Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
extruders Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
firmware Update firmware version 2018-10-23 11:29:12 +02:00
i18n Add translation for missing line in Korean 2018-11-08 09:48:52 +01:00
images Merge branch '3.5' into bb-3.5 2018-09-12 16:12:01 +02:00
meshes Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
qml Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
quality Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
setting_visibility Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
shaders Fix support blocker on older (legacy) opengl 2018-05-14 14:29:41 +02:00
themes Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00
variants Merge branch '3.6' into bb-3.6 2018-11-13 15:25:24 +01:00