Commit 15f8d51b authored by Ingo Meyer's avatar Ingo Meyer

Merge branch 'develop'

parents edb34e82 fc49eb75
__version_info__ = (0, 8, 1)
__version_info__ = (0, 8, 2)
__version__ = '.'.join(map(str, __version_info__))
......@@ -4,6 +4,10 @@ from __future__ import absolute_import
import os
import sys
import core.bonds
import core.control
from gui.tabs.file_tab import FileTabDock
from gui.tabs.view_tab import ViewTabDock
from gui.tabs.image_video_tab import ImageVideoTabDock
......@@ -20,10 +24,6 @@ import functools
import os.path
from config.configuration import config
import core.bonds
import core.control
#from import Results
......@@ -2,9 +2,9 @@
from PyQt4 import QtGui
from PyQt4.QtCore import QTimer, QProcess
import gr3
from gui.gl_widget import GLWidget
from core import file
import gr3
import os.path
import shutil
import tempfile
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment