-
git+ssh://scm.gforge.inria.fr//gitroot/vidjil/vidjilMathieu Giraud authored
Conflicts: browser/css/vidjil.less browser/index.html browser/js/model.js browser/js/scatterPlot.js
e2cb9928
Conflicts: browser/css/vidjil.less browser/index.html browser/js/model.js browser/js/scatterPlot.js