summaryrefslogtreecommitdiffstats
path: root/setup.py
diff options
context:
space:
mode:
authorRick Harris <rick.harris@rackspace.com>2011-05-31 20:49:49 +0000
committerRick Harris <rick.harris@rackspace.com>2011-05-31 20:49:49 +0000
commitb4845fa52affacf76ae1668079f1cc7dfa1b4004 (patch)
tree09c5e661f15551ef6fe16bfd719a9fdb8b86895d /setup.py
parent1b610e28e40c77271191349b6bfaa56c8f522c24 (diff)
parent3812bb4c7e6fcee4c87c1225d9c725db08527018 (diff)
Resolving conflict and finish test_images
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions