vbystricky
							
						 
					 | 
					
						
						
							
						
						d58f736935
					 | 
					
						
						
							
							Split highgui module to videoio and highgui
						
						
						
						
						
						
					 | 
					
						2014-07-14 23:16:47 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								vbystricky
							
						 
					 | 
					
						
						
							
						
						4286f60387
					 | 
					
						
						
							
							Extract imgcodecs module from highgui
						
						
						
						
						
						
					 | 
					
						2014-07-07 16:28:08 +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
							
						 
					 | 
					
						
						
							
						
						3b364330ad
					 | 
					
						
						
							
							Merge branch '2.4'
						
						
						
						
						
						
					 | 
					
						2013-04-12 15:35:38 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Roman Donchenko
							
						 
					 | 
					
						
						
							
						
						57d4c86b2b
					 | 
					
						
						
							
							Fixed the shebang lines on the Python scripts.
						
						
						
						
						
						
						
						Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script. 
						
						
					 | 
					
						2013-04-11 18:37:23 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Andrey Kamaev
							
						 
					 | 
					
						
						
							
						
						ad5cddc007
					 | 
					
						
						
							
							Main module headers are moved 1 level up
						
						
						
						
						
						
						
						e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp> 
						
						
					 | 
					
						2013-03-13 17:26:56 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								marina.kolpakova
							
						 
					 | 
					
						
						
							
						
						285d6320be
					 | 
					
						
						
							
							add #/usr/bin/env python to all python files
						
						
						
						
						
						
					 | 
					
						2012-11-23 22:57:22 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								OpenCV Buildbot
							
						 
					 | 
					
						
						
							
						
						04384a71e4
					 | 
					
						
						
							
							Normalize line endings and whitespace
						
						
						
						
						
						
					 | 
					
						2012-10-17 15:32:23 +04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						d5d0a2f8e0
					 | 
					
						
						
							
							propagated some more fixes from 2.3 branch to the trunk
						
						
						
						
						
						
					 | 
					
						2011-06-29 22:26:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Maria Dimashova
							
						 
					 | 
					
						
						
							
						
						3d74662f5a
					 | 
					
						
						
							
							updated check_docs script and whitelist
						
						
						
						
						
						
					 | 
					
						2011-06-17 11:33:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						20aca7440f
					 | 
					
						
						
							
							a lot of small corrections to bring down the number of undocumented functions, reported by the script; added em.cpp sample
						
						
						
						
						
						
					 | 
					
						2011-06-09 01:16:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						3b9e752be7
					 | 
					
						
						
							
							some more core functions documented + minor fixes and rearrangements
						
						
						
						
						
						
					 | 
					
						2011-06-08 21:35:19 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						5441130e21
					 | 
					
						
						
							
							added "whitelist" capability to the documentation check script
						
						
						
						
						
						
					 | 
					
						2011-06-08 19:53:06 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						c7a42e9682
					 | 
					
						
						
							
							started work on API & doc synchronization (in particular, Mat& => Input/OutputArray in the descriptions)
						
						
						
						
						
						
					 | 
					
						2011-06-07 22:51:31 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Vadim Pisarevsky
							
						 
					 | 
					
						
						
							
						
						124967eefb
					 | 
					
						
						
							
							very first version of the documentation checking script
						
						
						
						
						
						
					 | 
					
						2011-06-01 21:15:36 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |