Roman Donchenko 9d87f9c974 Merge pull request #1956 from ilya-lavrenov:tapi_split_merge		2013-12-09 16:56:06 +04:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-03 17:35:21 +04:00
include/opencv2	Merge pull request #1855 from Nerei:master	2013-12-09 14:13:40 +04:00
perf	core/ocl: added perf test infra + "Add" perf test	2013-12-03 18:43:50 +04:00
src	Merge pull request #1956 from ilya-lavrenov:tapi_split_merge	2013-12-09 16:56:06 +04:00
test	Merge pull request #1956 from ilya-lavrenov:tapi_split_merge	2013-12-09 16:56:06 +04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/2.4' into merge-2.4	2013-10-15 20:08:52 +04:00