diff options
| author | Tomas Touceda <chiiph@leap.se> | 2013-04-11 15:07:54 -0300 |
|---|---|---|
| committer | Tomas Touceda <chiiph@leap.se> | 2013-04-11 15:07:54 -0300 |
| commit | e0032a6c97b3ed766698521c76bc37d0655f4277 (patch) | |
| tree | 7808ca6adc8babf42aab34b7cad4271780dda0a9 /pkg | |
| parent | b585cefa15a1d7a03dd8a6c5651220ac3fd94fd1 (diff) | |
| parent | cf6c30f6f046401dead7a990f56bf9ad2c7cfa01 (diff) | |
Merge remote-tracking branch 'kali/feature/single-instance-app2' into develop
Conflicts:
src/leap/gui/mainwindow.py
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 0051380a..ad06fd56 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -13,4 +13,4 @@ keyring python-dateutil psutil -leap.common +leap.common>=0.2.1-dev |