| 
							
							
								 Maksim Shabunin | d01bedbc61 | Removed Sphinx documentation files | 2014-12-26 19:12:19 +03:00 |  | 
			
				
					| 
							
							
								 Maksim Shabunin | d3beb755df | Doxygen tutorials: support contrib, some minor changes | 2014-12-01 19:22:04 +03:00 |  | 
			
				
					| 
							
							
								 Maksim Shabunin | 36a04ef8de | Doxygen tutorials: cpp done | 2014-12-01 16:05:38 +03:00 |  | 
			
				
					| 
							
							
								 Maksim Shabunin | c5536534d8 | Doxygen tutorials: warnings cleared | 2014-12-01 16:05:38 +03:00 |  | 
			
				
					| 
							
							
								 Maksim Shabunin | 8375182e34 | Doxygen tutorials: basic structure | 2014-12-01 16:05:37 +03:00 |  | 
			
				
					| 
							
							
								 Maksim Shabunin | 220f671655 | Doxygen tutorials: some fixes in RST-docs | 2014-12-01 16:05:37 +03:00 |  | 
			
				
					| 
							
							
								 berak | 7cb3f3def7 | change remaining c-api CV_ prefixes in constants | 2014-10-04 14:10:12 +02:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | 31df47b6ea | moved nonfree and a part of features2d to opencv_contrib/xfeatures2d | 2014-08-11 23:26:39 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | d58cd9851f | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py | 2013-12-03 17:35:21 +04:00 |  | 
			
				
					| 
							
							
								 StevenPuttemans | 6f892b10ff | Applied feature #3375 and fix of pull 1842 to avoid merging problems later | 2013-11-25 10:53:03 +01: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 | 67073daf19 | Merge branch '2.4' | 2013-04-05 21:11:59 +04:00 |  | 
			
				
					| 
							
							
								 Gurpinder Singh Sandhu | 87b84a4197 | another update | 2013-04-04 23:13:03 +05:30 |  | 
			
				
					| 
							
							
								 Gurpinder Singh Sandhu | d51d05fc44 | Feature description tutorials made in sync with sample code sample code : https://github.com/Itseez/opencv/blob/master/samples/cpp/tutorial_code/features2D/SURF_descriptor.cpp
Bug #2888 | 2013-04-04 23:12:18 +05:30 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Daniil Osokin | 7305f955a5 | Added nonfree header in "Feature description" tutorial code sample (bug #2527) | 2013-01-30 11:07:09 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 639bbec44a | svn repository web references are replaced with links to git | 2012-08-24 15:59:43 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Shishkov | be63ce723f | #1672 updated links in cheatsheet
renamed directory for Mat tutorial 
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine | 2012-03-11 14:35:46 +00:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 6b88d7a898 | Added base tutorial for using FlannBasedMatcher with SURF detector + descriptor in rst | 2011-08-12 18:30:20 +00:00 |  | 
			
				
					| 
							
							
								 Ana Huaman | 07754b6309 | Added Features2D descriptor tutorial + drawMatches in rst | 2011-08-12 17:01:10 +00:00 |  |