Alexander Alekhin af1d29db83 Merge pull request #3332 from lupustr3:pvlasov/implementation_detector		2014-10-16 14:51:53 +00:00
..
doc	Merge remote-tracking branch 'upstream/master'	2014-10-06 23:46:30 +02:00
include/opencv2	Added UPNP flag	2014-10-02 16:43:15 +02:00
perf	this is trivial change; the main change is in opencv_extra - added regression data for perf tests	2014-10-11 22:57:22 +04:00
src	Implementation detector and selector for IPP and OpenCL;	2014-10-15 14:24:41 +04:00
test	Merge pull request #3270 from boaz001:patch-1	2014-10-16 10:09:28 +00:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00