summaryrefslogtreecommitdiff
path: root/aerialvision
diff options
context:
space:
mode:
authorTor Aamodt <[email protected]>2018-03-28 15:53:59 -0700
committerTor Aamodt <[email protected]>2018-03-28 15:53:59 -0700
commitd0ee86a0d39f9dfa1eba13ea6cca1b1d0e86523b (patch)
treeb64f6bc12df0785271f73ddc805c1e2b05db0f1c /aerialvision
parent7758943c96d22cd65f3de30b36c71b27370de5ce (diff)
parent635366fe3e9b596318647b9c5bcdd546c522d52a (diff)
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'aerialvision')
-rw-r--r--aerialvision/guiclasses.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/aerialvision/guiclasses.py b/aerialvision/guiclasses.py
index 0a7013b..45fed26 100644
--- a/aerialvision/guiclasses.py
+++ b/aerialvision/guiclasses.py
@@ -69,7 +69,7 @@ import matplotlib
matplotlib.use('TkAgg')
from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg, NavigationToolbar2TkAgg
from matplotlib.figure import Figure
-from matplotlib import mpl
+import matplotlib as mpl
from matplotlib.colors import colorConverter
from matplotlib import pyplot
import Pmw