| 
							
							
								 Suleyman TURKMEN | 11ca1c95f8 | update cpp samples and tutorials | 2016-06-26 20:55:00 +03:00 |  | 
			
				
					| 
							
							
								 vbystricky | d58f736935 | Split highgui module to videoio and highgui | 2014-07-14 23:16:47 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | 2c4bbb313c | Merge commit '43aec5ad' into merge-2.4 Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py | 2013-08-27 13:26:44 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | e9a28f66ee | Normalized file endings. | 2013-08-21 18:59:25 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0738ea7d0f | Make highgui.hpp independent from C API | 2013-04-08 15:47:29 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 288a0634c2 | Make imgproc.hpp independent from C API | 2013-04-08 15:47:28 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 2a6fb2867e | Remove all using directives for STL namespace and members Made all STL usages explicit to be able automatically find all usages of
particular class or function. | 2013-02-25 15:04:17 +04:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | 4985c1b632 | fixed hundreds of warnings from MSVC 2010. | 2012-03-16 21:21:04 +00:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | 32ed1bf858 | added phaseCorrelate function by Will Lucas. | 2011-09-05 07:57:18 +00:00 |  |