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

This commit is contained in:
Jaime van Kessel 2016-06-10 11:48:55 +02:00
commit 02d2acd317

5
.gitignore vendored
View File

@ -16,8 +16,11 @@ resources/firmware
*~
*.qm
.idea
# Eclipse+PyDev
.project
.pydevproject
.settings
# Debian packaging
debian/
debian*