Merge branch 'master' into reorg

Jordan Cheney
2 parents f1d8a9e3 8fde04e6
Showing 2 changed files with 1 additions and 2 deletions
app/examples/face_recognition_evaluation.cpp
share/openbr/cmake/FindLibLinear.cmake
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
 {
     br_initialize(argc, argv);
  
-    // Equivalent to 'Globals->algorithm = "FaceRecognion";' in C++ API
+    // Equivalent to 'Globals->algorithm = "FaceRecognition";' in C++ API
     br_set_property("algorithm", "FaceRecognition");
  
     // Equivalent to 'Globals->path = "../data/MEDS/img/";' in C++ API
 find_path(LibLinear_DIR linear.h ${CMAKE_SOURCE_DIR}/3rdparty/*)
  
-message(${LibLinear_DIR})
 mark_as_advanced(LibLinear_DIR)
 include_directories(${LibLinear_DIR})
 include_directories(${LibLinear_DIR}/blas)