Marina Kolpakova 2777ebb8a0 merged GPU scan		2012-06-28 16:00:38 +00:00
..
doc	Megred fix for pyrhon API generator regression r8528	2012-05-31 11:12:12 +00:00
include/opencv2/gpu	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
perf	merged GPU scan	2012-06-28 16:00:38 +00:00
src	merged GPU scan	2012-06-28 16:00:38 +00:00
test	Merged revision(s) 8679 from trunk:	2012-06-27 10:53:35 +00:00
CMakeLists.txt	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00