Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 13 Nov 2012 15:54:48 +0000 (19:54 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 13 Nov 2012 15:54:48 +0000 (19:54 +0400)
commit9719ea93b68cc4687381de5044572e73beb561f7
treefbd4a36113c581f3461f14374388ab358775b4c9
parentaba5bae400af419ebcb8585077a256d0870e0702
parent72a63922d2aba33711d355cf5dfb87a281a92833
Merge branch 2.4
modules/contrib/src/facerec.cpp
modules/core/src/opengl_interop.cpp
modules/core/test/test_math.cpp
modules/gpu/src/pyrlk.cpp