merged all the latest changes from 2.4 to trunk

2012-04-13 21:50:59 +00:00
parent 020f9a6047
commit 2fd1e2ea57
416 changed files with 12852 additions and 6070 deletions
--- a/samples/cpp/em.cpp
+++ b/samples/cpp/em.cpp
@@ -1,4 +1,4 @@
-#include "opencv2/ml/ml.hpp"
+#include "opencv2/legacy/legacy.hpp"
 #include "opencv2/highgui/highgui.hpp"

 using namespace cv;