 Roman Donchenko
		
	
	e45fd939c2
	
	
	Merge remote-tracking branch 'origin/2.4' into merge-2.4
			Roman Donchenko
		
	
	e45fd939c2
	
	
	Merge remote-tracking branch 'origin/2.4' into merge-2.4
		
			
			Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
		
	
 
		2014-01-20 15:10:19 +04:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2014-01-16 21:53:49 +01:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00
		 
	
		
			
			
			
			
			
			2014-01-13 16:09:42 +01:00
		 
	
		
			
			
			
			
			
			2013-10-18 15:44:55 +04:00