diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-28 14:35:24 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-28 14:35:24 -0300 |
| commit | 8a94537a66275950d6b9fb986ca1ae3970fd9232 (patch) | |
| tree | 3c8ca8df4a2d291cb20e24bbc6d9f5a11c0ab2ab /src/leap/bitmask/gui/__init__.py | |
| parent | 5b6b878289737e72ba7156ec320d2e811358327c (diff) | |
| parent | a3d229bd52405146e188905ec1d37c7bfb30320f (diff) | |
Merge remote-tracking branch 'ivan/feature/preferences-select-services' into develop
Conflicts:
src/leap/bitmask/gui/mainwindow.py
src/leap/bitmask/gui/preferenceswindow.py
Diffstat (limited to 'src/leap/bitmask/gui/__init__.py')
0 files changed, 0 insertions, 0 deletions