merged master onto senslab2, manually solved conflicts in setup.py
[sfa.git] / .gitignore
2011-11-03 Thierry Parmentelatmerged master onto senslab2, manually solved conflicts...
2011-10-27 Nicolas TurroMerge branch 'master' of ssh://git.f-lab.fr/git/sfa
2011-10-21 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2011-10-21 Thierry Parmentelatminor cleanup
2011-04-15 Marco YuenMerge branch 'master' into eucalyptus-devel
2011-03-30 Thierry Parmentelattweak ignore for index.html
2011-03-29 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-03-29 Thierry Parmentelatmore ignores
2011-03-08 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2011-03-08 Thierry Parmentelatmore ignored files
2011-01-04 Thierry Parmentelatignore version.py, master is version.py.in
2010-10-22 Thierry Parmentelatignore emacs backup files
2010-10-19 Thierry ParmentelatMerge branch 'master' of ssh://git.onelab.eu/git/sfa
2010-10-19 Thierry Parmentelattentatively package unittests in rpm sfa-tests, for...
2010-10-06 Josh Karlinmerged namespace
2010-10-04 Tony MackMerge branch 'master' of ssh://git.planet-lab.org/git/sfa
2010-10-01 Barış Metinadd .gitignore