| 
							
							
								 Maksim Shabunin | 03e213ccae | Doxygen documentation: BiB references and fixes | 2014-12-01 15:50:55 +03:00 |  | 
			
				
					| 
							
							
								 Maksim Shabunin | 9d89f8d3dc | Doxygen documentation: shape, superres, videostab | 2014-12-01 15:47:13 +03:00 |  | 
			
				
					| 
							
							
								 Ilya Lavrenov | 6ad4823f0c | ported superres to T-API | 2014-02-01 17:20:18 +04:00 |  | 
			
				
					| 
							
							
								 Vladislav Vinogradov | fd88654b45 | replaced GPU -> CUDA | 2013-09-02 14:00:44 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | feaa12a274 | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/initialization.cpp
	modules/ocl/test/main.cpp
	modules/superres/CMakeLists.txt
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/input_array_utility.hpp
	modules/superres/src/optical_flow.cpp | 2013-07-16 11:52:41 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | f77a375354 | Merge branch '2.4' | 2013-03-29 19:38:35 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | be7bbe3aa9 | Drop cv:: prefix from cv::String used inside the cv namespace | 2013-03-22 22:14:50 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 2ad7b97f1c | All modules (except ocl and gpu) compiles and pass tests | 2013-03-22 22:14:26 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 1ca8f33b4e | Merge branch '2.4' | 2013-03-21 23:11:54 +04:00 |  |