Merge branch 'master' of https://github.com/yuhuazou/kaze_opencv

Conflicts: predep.h
yuhuazou · Mar 28, 2013 · dda573f · dda573f
2 parents 7e3ed22 + 98d7673
commit dda573f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 kaze_opencv
 ===========
 
-wrap KAZE features implementation to cv::Feature2D API without rebuilding OpenCV
+wrap KAZE features implementation to cv::Feature2D API without rebuilding OpenCV (minimum version 2.4)
 
 Files:  
 

diff --git a/predep.h b/predep.h
@@ -19,4 +19,4 @@
 #define cvLIB(name) "opencv_" name CV_VERSION_ID
 #endif
 
-#endif
+#endif