Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 1 Dec 2011 14:52:32 +0000 (15:52 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 1 Dec 2011 14:52:32 +0000 (15:52 +0100)
commitd58bbc6238ee07a3e386b2627aa64ccb2dce352f
treeece71ae0d9ab9ec3e3d6853e28cf371f82971fc8
parent3fd50980be09880ffbb6c6d321375a321a4cf167
parentfe26b3a1489881ee252977df84561ea51da93ec2
Merge branch 'master' into senslab2
setup.py
sfa/methods/ListResources.py