Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1

This commit is contained in:
ChrisTerBeke 2017-11-22 16:22:34 +01:00
commit fe016e336d

1
.gitignore vendored
View File

@ -44,6 +44,7 @@ plugins/cura-god-mode-plugin
plugins/cura-big-flame-graph
plugins/cura-siemensnx-plugin
plugins/CuraVariSlicePlugin
plugins/CuraLiveScriptingPlugin
#Build stuff
CMakeCache.txt