Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-03-29 18:48:06 +04:00
291 changed files with 5110 additions and 2325 deletions

View File

@@ -45,4 +45,4 @@
#error this is a compatibility header which should not be used inside the OpenCV library
#endif
#include "opencv2/imgproc.hpp"
#include "opencv2/imgproc.hpp"