diff options
| author | Kali Kaneko <kali@leap.se> | 2013-09-05 20:34:30 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-09-05 20:34:30 +0200 |
| commit | 75109de1283be85309d1795d518ef8a8c2ef4f07 (patch) | |
| tree | e6cf03a406eb3e0dbd7310973070a50e31eccf7c /src | |
| parent | 2bcff2cf5154af5bf129ced066a014925a5eac0b (diff) | |
| parent | 6a4b2a00b59ac017b05e88812b2eb5ed8341bd66 (diff) | |
Merge remote-tracking branch 'ivan-github/bug/version-namespace-hotfix' into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/leap/bitmask/app.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/bitmask/app.py b/src/leap/bitmask/app.py index 0dce5e61..158f1afe 100644 --- a/src/leap/bitmask/app.py +++ b/src/leap/bitmask/app.py @@ -156,7 +156,7 @@ def main(): from leap.bitmask.gui.mainwindow import MainWindow from leap.bitmask.platform_init import IS_MAC from leap.bitmask.platform_init.locks import we_are_the_one_and_only - from leap.bitmask.util import __version__ as VERSION + from leap.bitmask import __version__ as VERSION from leap.bitmask.util.requirement_checker import check_requirements # pylint: avoid unused import diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 1fdd0792..706b9c2a 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -58,7 +58,7 @@ from leap.bitmask.services.eip.vpnlaunchers import \ EIPNoPolkitAuthAgentAvailable from leap.bitmask.services.eip.vpnlaunchers import EIPNoTunKextLoaded -from leap.bitmask.util import __version__ as VERSION +from leap.bitmask import __version__ as VERSION from leap.bitmask.util.keyring_helpers import has_keyring from leap.bitmask.util.leap_log_handler import LeapLogHandler |