Merge branch 'master' of github.com:daid/Cura
This commit is contained in:
Daid
commit
3ec6fa40d6
238 changed files with 428 additions and 221 deletions
|
|
@ -14,9 +14,9 @@ import __init__
|
|||
|
||||
import sys
|
||||
import platform
|
||||
|
||||
from optparse import OptionParser
|
||||
from newui import sliceRun
|
||||
|
||||
from util import sliceRun
|
||||
|
||||
__author__ = 'Daid'
|
||||
__credits__ = """
|
||||
|
|
@ -49,7 +49,7 @@ def main():
|
|||
if len( args ) > 0:
|
||||
sliceRun.runSlice(args)
|
||||
else:
|
||||
from newui import mainWindow
|
||||
from gui import mainWindow
|
||||
mainWindow.main()
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue