Merge pull request #2146 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 17 Jan 2014 12:28:29 +0000 (16:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 17 Jan 2014 12:28:30 +0000 (16:28 +0400)
commit79fcc06a4b463d411da2b22d1fb2823b16ea6a26
tree3fe61af0707d1c87498252f82cb3ab44fe6bc5ea
parent659c5345d904d07e293fe4b8212e3a668449687a
parent092f916db94186758027dd0fc56655ea2e7b4a98
Merge pull request #2146 from SpecLad:merge-2.4
modules/core/include/opencv2/core/mat.inl.hpp
modules/highgui/src/window_w32.cpp
modules/ts/include/opencv2/ts/ts_perf.hpp