summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorcpascual <cpascual@cells.es>2014-04-29 14:11:40 +0200
committercpascual <cpascual@cells.es>2014-04-29 14:20:38 +0200
commit0a145fc8b8022cd15d98849c6035bd8ac6a10f6f (patch)
treeb9af6a20a293c5a8f5bc1046c84b9bb3b0a304d6 /setup.py
parentc16ebcae32ff1423848709e09ea4c8abf87f0156 (diff)
parentab1b57dd311576c9b8753f27373013ea2bc0afb1 (diff)
Merge branch sep5 into develop
SEP5 has been accepted. Integrate the sep5 branch into develop
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions