Merge branch 'master' into feature_curaversion_appname

# Conflicts:
#	cura/CuraApplication.py
This commit is contained in:
fieldOfView 2019-01-18 12:12:36 +01:00
commit 056655e584
1147 changed files with 62054 additions and 12466 deletions

View file

@ -17,12 +17,6 @@ parser.add_argument("--debug",
default = False,
help = "Turn on the debug mode by setting this option."
)
parser.add_argument("--trigger-early-crash",
dest = "trigger_early_crash",
action = "store_true",
default = False,
help = "FOR TESTING ONLY. Trigger an early crash to show the crash dialog."
)
known_args = vars(parser.parse_known_args()[0])
if not known_args["debug"]: