Alexander Alekhin d47a2988a9 Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix		2014-08-21 15:48:10 +00:00
..
doc	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00
include/opencv2	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	Build fix for NVIDIA Tegra optimizations integration.	2014-08-19 11:40:25 +04:00
test	multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics	2014-08-16 00:29:10 +04:00
CMakeLists.txt	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00