Merge pull request #2702 from GregoryMorse:patch-3

1578dd10 · Vadim Pisarevsky · 06e55ddf · b5a4159e · 1578dd10 · 1578dd10
Commit 1578dd10 authored Sep 18, 2014 by Vadim Pisarevsky
Showing with 0 additions and 0 deletions

agile_wrl.h modules/highgui/src/agile_wrl.h +0 -0

ppltasks_winrt.h modules/highgui/src/ppltasks_winrt.h +0 -0

cap_msmf.cpp modules/videoio/src/cap_msmf.cpp +0 -0

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

No files found.
--- a/modules/highgui/src/agile_wrl.h
+++ b/modules/highgui/src/agile_wrl.h
--- a/modules/highgui/src/ppltasks_winrt.h
+++ b/modules/highgui/src/ppltasks_winrt.h
--- a/modules/videoio/src/cap_msmf.cpp
+++ b/modules/videoio/src/cap_msmf.cpp
--- a/modules/videoio/src/cap_msmf.hpp
+++ b/modules/videoio/src/cap_msmf.hpp