Fixing merge form master compatibility problems.
authorSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 28 Nov 2011 13:03:49 +0000 (14:03 +0100)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Mon, 28 Nov 2011 13:03:49 +0000 (14:03 +0100)
commitc691fe2f6cf2924fdbaf90976c775afcbb02a773
tree73a4e20632e5caae18576d614feb7132d10d0539
parentbb57cb30c7cfdddcf8e55fd7084e3cdaf67eaac4
Fixing merge form master compatibility problems.
sfa/generic/slab.py
sfa/managers/aggregate_manager_slab.py
sfa/senslab/OARrspec.py