From ca307669d468b3846ade6e762c39f73f90504230 Mon Sep 17 00:00:00 2001
From: VBystricky <vladimir.bystricky@stdutility.com>
Date: Mon, 14 Jul 2014 23:30:50 +0400
Subject: [PATCH] Refresh code. Fix merge conflict

---
 modules/videoio/CMakeLists.txt                 | 1 +
 modules/{highgui => videoio}/src/cap_dshow.hpp | 0
 2 files changed, 1 insertion(+)
 rename modules/{highgui => videoio}/src/cap_dshow.hpp (100%)

diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt
index 527662b9da..2ac7811c75 100644
--- 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)
diff --git a/modules/highgui/src/cap_dshow.hpp b/modules/videoio/src/cap_dshow.hpp
similarity index 100%
rename from modules/highgui/src/cap_dshow.hpp
rename to modules/videoio/src/cap_dshow.hpp