Merge pull request #1427 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Sep 2013 14:28:19 +0000 (18:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Sep 2013 14:28:20 +0000 (18:28 +0400)
commit242e4254f37ad8af2444c6b9c853938ce22f5021
treebba327e89b7248b61fe000521b9e924b1828510d
parent72384798137a6ee1e699e477d8a0b445d3e3ae15
parent95c2e8b51fefa8764e14af4be0fdc458fbca16ea
Merge pull request #1427 from SpecLad:merge-2.4
.gitignore
modules/imgproc/include/opencv2/imgproc.hpp