| 
							
							
								 Suleyman TURKMEN | 11ca1c95f8 | update cpp samples and tutorials | 2016-06-26 20:55:00 +03:00 |  | 
			
				
					| 
							
							
								 ValeryTyumen | 297808e6b9 | Feature #3957 | 2015-12-17 18:19:39 +03:00 |  | 
			
				
					| 
							
							
								 vbystricky | d58f736935 | Split highgui module to videoio and highgui | 2014-07-14 23:16:47 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | 3c4b24d531 | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp | 2013-12-23 18:50:17 +04:00 |  | 
			
				
					| 
							
							
								 Vladimir Bystricky | dd71bef6f5 | Fix errors in example (samples/cpp/intelperc_capture.cpp) | 2013-12-18 09:59:24 +04:00 |  | 
			
				
					| 
							
							
								 Vladimir Bystricky | 63ae0eeba5 | Fix build errors | 2013-12-17 18:39:52 +04:00 |  | 
			
				
					| 
							
							
								 Vladimir Bystricky | cc08e00876 | Fix notes about cmake files. Fix build warning. | 2013-12-17 16:13:55 +04:00 |  | 
			
				
					| 
							
							
								 Vladimir Bystricky | 4088013251 | Add set/get depth generator properties by default. Add documentation | 2013-12-17 12:00:40 +04:00 |  | 
			
				
					| 
							
							
								 Vladimir Bystricky | e8d2a9752b | Add support Creative Senz3D camera by Intel Perceptual Computing SDK | 2013-12-13 17:25:16 +04:00 |  |