diff options
author | Micah Anderson <micah@riseup.net> | 2015-09-01 14:18:25 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2015-09-01 14:18:25 -0400 |
commit | 7c5de540396e1a84da4bbaf95865fc53239db5c3 (patch) | |
tree | 912d3bd175747fce1fd1fd4d1e01826598cad322 /pkg/requirements.pip | |
parent | 3bb0b76770a124a13226556b60bcd84d3cc99a0b (diff) | |
parent | 56724056f95e3d908c3fd11840cf62e64afb9e0f (diff) |
Merge remote-tracking branch 'kali/debian/0.4.2' into debian/experimental
Diffstat (limited to 'pkg/requirements.pip')
-rw-r--r-- | pkg/requirements.pip | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index c89fd19..02fb189 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,8 +1,8 @@ jsonschema #<=0.8 -- are we done with this conflict? dirspec -protobuf>=2.4.1 -protobuf.socketrpc pyopenssl python-dateutil +pyzmq>=14.4.1 +txzmq>=0.7.3 #autopep8 -- ??? |