Merge branch 'configfile' into checkboxes
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 1 Oct 2013 12:39:20 +0000 (14:39 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 1 Oct 2013 12:39:20 +0000 (14:39 +0200)
1  2 
portal/sliceview.py

Simple merge