Merge pull request #2334 from alalek:umat_usage_flags_2
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 17 Feb 2014 13:34:19 +0000 (17:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 17 Feb 2014 13:34:19 +0000 (17:34 +0400)
1  2 
modules/core/src/umatrix.cpp

Simple merge