diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-16 15:07:56 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-16 15:07:56 -0300 |
| commit | 709cbe02bee29cc75ffe9ccbc65c2db4e53e270f (patch) | |
| tree | 57ce5db8064070472361e4ff32c69dae4a29ffa3 /pkg | |
| parent | 602201a6fdd4b52a61f0b2a7ab25202c6cc1abb5 (diff) | |
| parent | 319e1d55a2f8e9c521450f60c571f24a907553ee (diff) | |
Merge remote-tracking branch 'kali/feature/use-qtreactor2' into develop
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements-dev.pip | 3 | ||||
| -rw-r--r-- | pkg/requirements.pip | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkg/requirements-dev.pip b/pkg/requirements-dev.pip index 23d50ceb..e241474a 100644 --- a/pkg/requirements-dev.pip +++ b/pkg/requirements-dev.pip @@ -11,5 +11,6 @@ # to install it. (do it after python setup.py develop and it # will only install this) --e git+git://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common sphinx + +-e git+git://github.com/leapcode/leap_pycommon.git@develop#egg=leap.common diff --git a/pkg/requirements.pip b/pkg/requirements.pip index a225d0de..3c5bfad0 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -13,5 +13,7 @@ keyring python-dateutil psutil ipaddr +twisted +qt4reactor -leap.common>=0.2.1-dev +leap.common>=0.2.3-dev |