Merge pull request #2750 from ilya-lavrenov:tapi_convertto
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 3 Jun 2014 12:36:48 +0000 (16:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Jun 2014 12:36:48 +0000 (16:36 +0400)
1  2 
modules/core/src/matrix.cpp
modules/core/src/stat.cpp
modules/core/src/umatrix.cpp

Simple merge
Simple merge
Simple merge