| 
							
							
								 Ernest Galbrun | 7b8bb4248b | Merge branch 'cuda_concurrency' into tvl1_chambolle | 2014-07-31 16:08:57 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 917107e635 | removed bm legacy | 2014-07-31 16:01:54 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | df8f1a4355 | removed legacy header | 2014-07-28 10:58:19 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 5c8e679bdc | still a couple tabs and trailing whitespaces... | 2014-07-07 12:34:23 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 693c4e5741 | debug of cuda_tvl1 => pass tests succesfully | 2014-07-04 14:23:09 +02:00 |  | 
			
				
					| 
							
							
								 Ernest Galbrun | 3e577b090e | removed legacy from cmake dependency removed legacy tests in cudaoptflow | 2014-07-03 15:26:51 +02:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | 029ffb7c2d | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp | 2014-02-17 15:24:05 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | fd88654b45 | replaced GPU -> CUDA | 2013-09-02 14:00:44 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | 5660d6a680 | renamed gpuoptflow -> cudaoptflow | 2013-09-02 14:00:43 +04:00 |  |