diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-12-09 10:22:50 -0400 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2010-12-09 10:22:50 -0400 |
| commit | e6079449dc034234dc24e77b94bbcc4a257387d9 (patch) | |
| tree | df2d66c6c03d328069f4a8524dbaa897afd65f81 /tools | |
| parent | f0b53131569cd409a95c68b435ec56a69dcdc897 (diff) | |
| parent | 3c114a7dd596dfb12de42577711d97d1a98d10ec (diff) | |
Fixed Authors conflict and re-merged with trunk
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 548073326..17a1a4c5c 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -20,3 +20,4 @@ mox==0.5.0 -f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz greenlet==0.3.1 nose +bzr |