Merge branch 'master' into layer_view3_cleanup

This commit is contained in:
Jack Ha 2017-01-17 15:16:50 +01:00
commit abe7a8e9a3
42 changed files with 12101 additions and 89 deletions

View file

@ -1,4 +1,5 @@
from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty
from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty
from UM.FlameProfiler import pyqtSlot
from UM.Application import Application
import LayerView