Refresh code. Fix merge conflict

ca307669 · VBystricky · d58f7369 · ca307669 · ca307669
Commit ca307669 authored Jul 14, 2014 by VBystricky
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

CMakeLists.txt modules/videoio/CMakeLists.txt +1 -0

cap_dshow.hpp modules/videoio/src/cap_dshow.hpp +0 -0

No files found.
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@@ -35,6 +35,7 @@ endif()

 if (WIN32 AND HAVE_DSHOW)
  list(APPEND videoio_srcs src/cap_dshow.cpp)
+  list(APPEND videoio_hdrs src/cap_dshow.hpp)
 endif()

 if (WIN32 AND HAVE_MSMF)

--- a/modules/highgui/src/cap_dshow.hpp
+++ b/modules/highgui/src/cap_dshow.hpp