summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-12-22 20:54:58 +0000
committerVishvananda Ishaya <vishvananda@gmail.com>2010-12-22 20:54:58 +0000
commit9d4a60d6bd7621b44a1ccd4a48741f32e620f342 (patch)
tree0904abbefd68ef786407cea494b29a064af6de12 /tools
parentdb938f975da64540ebb942e9dfd640db4dd7f939 (diff)
parentff1575e782fb08fb3923a09cb1a18d703b33be4a (diff)
fixed conflicts
Diffstat (limited to 'tools')
-rw-r--r--tools/pip-requires1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/pip-requires b/tools/pip-requires
index 52451b8cb..e9559521b 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -2,6 +2,7 @@ SQLAlchemy==0.6.3
pep8==0.5.0
pylint==0.19
IPy==0.70
+Cheetah==2.4.2.1
M2Crypto==0.20.2
amqplib==0.6.1
anyjson==0.2.4