Skip to content

MDANSE
MDANSE
Commit 1a903f90 authored by eric pellegrini's avatar eric pellegrini
Browse files
Options

Merge branch 'bugfix-macos_finder_quit_thread' into develop

parents 0452629b 099a8562
Pipeline #1486 passed with stages
        in 13 minutes and 53 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 5 additions and 3 deletions
        MDANSE/GUI/JobControllerPanel.py
        View file @ 1a903f90
        ......@@ -75,6 +75,8 @@ class JobController(threading.Thread):
        '''
        threading.Thread.__init__(self)
        self.setDaemon(True)
        # The wx object related to this thread
        self._window = window
        ......@@ -366,4 +368,4 @@ if __name__ == "__main__":
        \ No newline at end of file
        MDANSE/__pkginfo__.py
        View file @ 1a903f90
        __version__ = "1.0.4"
        __version__ = "1.0.5"
        __date__ = "25-01-2017"
        __date__ = "06-03-2017"
        __author__ = "Eric Pellegrini"
        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