diff options
| author | Ghostkeeper <rubend@tutanota.com> | 2018-03-09 17:36:51 +0300 |
|---|---|---|
| committer | Ghostkeeper <rubend@tutanota.com> | 2018-03-09 17:36:51 +0300 |
| commit | 71afbba7891c3765dc902864e34bf6c5e5a59fdd (patch) | |
| tree | f2cca02910eca3ad7b3ac7e832be32a915509975 /cura/CrashHandler.py | |
| parent | c54ea001112cc4a50965b04f7a9d5f451357185b (diff) | |
| parent | aed1b2ab8ecf50036039b0d264176d602c5baaa2 (diff) | |
Merge branch '3.2'
Diffstat (limited to 'cura/CrashHandler.py')
| -rw-r--r-- | cura/CrashHandler.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index d74b48a53a..7a94c69301 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -1,4 +1,4 @@ -# Copyright (c) 2017 Ultimaker B.V. +# Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import platform @@ -14,10 +14,11 @@ import urllib.request import urllib.error import shutil -from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, QUrl +from PyQt5.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, Qt, QUrl from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QTextEdit, QGroupBox, QCheckBox, QPushButton from PyQt5.QtGui import QDesktopServices +from UM.Resources import Resources from UM.Application import Application from UM.Logger import Logger from UM.View.GL.OpenGL import OpenGL |