Roman Donchenko 313a0ad255 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/arithm.cpp
	modules/imgproc/src/imgwarp.cpp
	modules/objdetect/src/hog.cpp
2014-05-12 17:38:07 +04:00
..
2014-04-08 14:49:20 +04:00
2014-04-08 14:49:20 +04:00
2014-04-07 18:53:07 +04:00
2014-04-08 14:49:20 +04:00
2013-12-27 20:02:12 +04:00
2014-02-15 15:51:52 +04:00
2013-09-05 19:03:00 +04:00
2014-02-22 09:54:16 +05:30