| 
							
							
								 Roman Donchenko | 9ed475cf52 | War on Whitespace, master edition: file endings. | 2013-08-27 14:23:26 +04:00 |  | 
			
				
					| 
							
							
								 Roman Donchenko | 4cf9990d4e | Merge remote-tracking branch 'origin/2.4' into merge-2.4 Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp | 2013-07-03 19:53:21 +04:00 |  | 
			
				
					| 
							
							
								 Kirill Kornyakov | aef347e7b3 | Removed references to opencv.itseez.com | 2013-06-28 12:48:12 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0e7ca71dcc | Normalize whitespace in documentation and text files | 2012-10-17 21:42:09 +04:00 |  | 
			
				
					| 
							
							
								 OpenCV Buildbot | 81f826db2b | Normalize line endings and whitespace | 2012-10-17 15:57:49 +04:00 |  | 
			
				
					| 
							
							
								 OpenCV Buildbot | 04384a71e4 | Normalize line endings and whitespace | 2012-10-17 15:32:23 +04:00 |  | 
			
				
					| 
							
							
								 Bernat Gabor | f25603112a | Added Fernandos first tutorial regarding SVMs. Extended the global links (conf.py). Corrected the author names. Minor modification to the dft tutorial. | 2011-07-25 07:15:52 +00:00 |  |