Roman Donchenko 20bf1aa244 Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix		2013-08-22 12:46:00 +04:00
..
doc	Normalized file endings.	2013-08-21 18:59:25 +04:00
include/opencv2/contrib	Normalized file endings.	2013-08-21 18:59:25 +04:00
src	Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix	2013-08-22 12:46:00 +04:00
test	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00