Refresh code. Fix merge conflict
authorVBystricky <vladimir.bystricky@stdutility.com>
Mon, 14 Jul 2014 19:30:50 +0000 (23:30 +0400)
committerVBystricky <vladimir.bystricky@stdutility.com>
Mon, 14 Jul 2014 19:30:50 +0000 (23:30 +0400)
commitca307669d468b3846ade6e762c39f73f90504230
tree905808475285fd0f374d371ff173dc0c7075e928
parentd58f736935d368a7c2884efbe424d5caefe2796c
Refresh code. Fix merge conflict
modules/videoio/CMakeLists.txt
modules/videoio/src/cap_dshow.hpp [moved from modules/highgui/src/cap_dshow.hpp with 100% similarity]