diff options
| author | Tomas Touceda <chiiph@leap.se> | 2013-04-11 09:20:52 -0300 |
|---|---|---|
| committer | Tomas Touceda <chiiph@leap.se> | 2013-04-11 09:20:52 -0300 |
| commit | 63f0d92a715b8d84536a449dc1e6b2b5eb9a7cb2 (patch) | |
| tree | 6a8e80ffcb11f2ab2a27d09f49033fe92dc731b7 /pkg | |
| parent | 1693669bacac1febcc81ad782028e216804d6f35 (diff) | |
| parent | 8b83009219f468b93acd7ec7a54cbd12fb3bc9fb (diff) | |
Merge remote-tracking branch 'kali/bug/fix-imports' into develop
Conflicts:
pkg/requirements.pip
setup.py
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index ca21223..85e5aef 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -2,3 +2,5 @@ jsonschema<=0.8 pyxdg protobuf protobuf.socketrpc +pyopenssl +python-dateutil |