# Conflicts: # OpenFace.sln # lib/local/FaceAnalyser/FaceAnalyser.vcxproj.filters # lib/local/GazeAnalyser/GazeAnalyser.vcxproj |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| FaceLandmarkImg.cpp | ||
| FaceLandmarkImg.vcxproj | ||
| FaceLandmarkImg.vcxproj.user | ||
# Conflicts: # OpenFace.sln # lib/local/FaceAnalyser/FaceAnalyser.vcxproj.filters # lib/local/GazeAnalyser/GazeAnalyser.vcxproj |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| FaceLandmarkImg.cpp | ||
| FaceLandmarkImg.vcxproj | ||
| FaceLandmarkImg.vcxproj.user | ||