Andrey Kamaev f77a375354 Merge branch '2.4'		2013-03-29 19:38:35 +04:00
..
app/nv_perf_test
doc	Update documentation	2013-03-22 22:14:54 +04:00
include/opencv2	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
misc
perf	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
perf4au	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
src	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
test	Merge branch '2.4'	2013-03-29 19:38:35 +04:00
CMakeLists.txt	Merge branch '2.4'	2013-03-29 19:38:35 +04:00