Merge branch 'experimental'

[ozzloy@gmail.com/oble] / hello-world.cpp

diff --git a/hello-world.cpp b/hello-world.cpp
index 84919be17ceddf0c675abf93c31c550ab01a48d0..7d68365d76f153bf8073e24d9bb86514fc125d96 100644 (file)
--- a/hello-world.cpp
+++ b/hello-world.cpp
@@ -45,7 +45,8 @@ void detect_and_draw_objects(IplImage* image,
        cvReleaseMemStorage( &storage );
 }
 
-// A Simple Camera Capture Framework.  conflicting change on this line
+// A Simple Camera Capture Framework.
+>>>>>>> experimental:hello-world.cpp
 int main( int argc, char** argv )
 {
        CvHaarClassifierCascade* cascade = load_object_detector(argv[1]);