Merge pull request #7371 from mshabunin:aruco-java-wrap
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 1 Oct 2016 15:38:59 +0000 (15:38 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sat, 1 Oct 2016 15:38:59 +0000 (15:38 +0000)
1  2 
modules/ml/include/opencv2/ml.hpp

Simple merge