minor chnges for conflict removal

2013-04-29 15:12:44 +02:00
parent 16dea7b90d
commit 9549949228
6 changed files with 17 additions and 18 deletions
--- a/samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
+++ b/samples/cpp/tutorial_code/contrib/retina_tutorial.cpp
@@ -136,7 +136,7 @@ int main(int argc, char* argv[]) {
        }
    }catch(cv::Exception e)
    {
-        std::cerr<<"Error using Retina : "<<e.what()<<std::endl;
+        std::cerr<<"Error using Retina or end of video sequence reached : "<<e.what()<<std::endl;
    }

    // Program end message