-
Jussi Lindgren authored
Merge branch 'wip-jlindgre-merge-neuroelectrics-enobio' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into integration_0.18 Conflicts: scripts/win32-install_dependencies.exe
30f9400c
Merge branch 'wip-jlindgre-merge-neuroelectrics-enobio' of git+ssh://scm.gforge.inria.fr//gitroot/openvibe/openvibe into integration_0.18 Conflicts: scripts/win32-install_dependencies.exe