Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
authorChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 1 Mar 2012 16:56:49 +0000 (17:56 +0100)
committerChristophe Paccolat <christophe.paccolat@epfl.ch>
Thu, 1 Mar 2012 16:56:49 +0000 (17:56 +0100)
commit2b43174ec03b76e7923e97631b6c8203e9f53163
tree7f01ba89f1322624f3ab6adbb78313b73317ef07
parent54087c20bbc49af095296e5bc2d7ae0af45da828
parentf12abd8644f9d8b3d330f54c8b2e88901d90aa4b
Merge branch 'devel' of gitorious.org:mldemos/mldemos into devel
_AlgorithmsPlugins/OpenCV/pluginOpenCV.pro