Merge commit '1acc1085d' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:37:39 +0000 (16:37 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:37:39 +0000 (16:37 +0400)
1  2 
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h
modules/imgproc/include/opencv2/imgproc/imgproc_c.h