summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-24 01:01:06 +0900
committerkali <kali@leap.se>2012-08-24 01:01:06 +0900
commitc2955d9655e3e7ccb3c5fc9e7d00a0d493d48a40 (patch)
treeff21bf162a97b0cc448775d597b619226f191dfc /setup
parentbd154da54eb022d12d225a84cea1053f868eab56 (diff)
parentdc10833bedcdecf081a7c79678614c5521445164 (diff)
Merge branch 'get-definition.json' into providers-static
adjusted some loose ends to make tests pass again. this merge is still half-baked regarding functionality: I've left in place old Configuration class used by some tests antialias did on his branch. I plan to merge that functionality with the more recent JSONConfig and Spec classes. Conflicts: src/leap/base/configuration.py src/leap/eip/config.py src/leap/eip/tests/test_config.py
Diffstat (limited to 'setup')
0 files changed, 0 insertions, 0 deletions