diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-22 21:50:58 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2010-12-22 21:50:58 +0000 |
| commit | 440978ce046a73acede887117e9812f1a6a026fa (patch) | |
| tree | b0afd90999bf88f4efa8a42f5496cacd1561278a /tools | |
| parent | ca1017988f98a246aa82c16f471791c7ea3eceec (diff) | |
| parent | eb64fe72160ca7c68809eaf0af91768f4eb5d8e8 (diff) | |
merged trunk and fixed conflicts
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/pip-requires | 1 |
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 |