merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / docs / sfa-debian-installfromscratch.txt
2011-11-03 Thierry ParmentelatMerge branch 'upstreammaster'
2011-10-27 Nicolas TurroMerge branch 'master' of ssh://git.f-lab.fr/git/sfa
2011-10-20 Sandrine AvakianMerge branch 'master' into exp2
2011-06-28 Nicolas TurroSmall edit in order to test the git repo. NT.
2011-06-17 Nicolas TurroWrite test on the repo.