commiting a change on master to test git branching

diff --git a/hello-world.cpp b/hello-world.cpp
index e9bb476485fbd668247e0ce104aa1276300b5e68..6c2f7251897d357bfe5f7fff91103c47fb98f269 100644 (file)
--- a/hello-world.cpp
+++ b/hello-world.cpp
@@ -7,9 +7,9 @@ CvHaarClassifierCascade* load_object_detector( const char* cascade_path )
        return (CvHaarClassifierCascade*)cvLoad( cascade_path );
 }
 
-void detect_and_draw_objects( IplImage* image,
+void detect_and_draw_objects(IplImage* image,
                CvHaarClassifierCascade* cascade,
-               int do_pyramids )
+               int do_pyramids)
 {
        IplImage* small_image = image;
        CvMemStorage* storage = cvCreateMemStorage(0);