| 
							
							
								 Alexander Smorkalov | 637b48eec8 | Tutorial for ARM Linux cross compilation added. | 2013-02-20 12:48:30 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 637397f621 | Merge branch '2.4' | 2013-02-20 12:31:16 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0570aa6494 | Avoid problem of old sphinx reporting an error on lines starting from : See http://sourceforge.net/tracker/?func=detail&aid=3484857&group_id=38414&atid=422030 | 2013-02-19 10:34:43 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 262fc929aa | Merge branch '2.4' | 2013-02-18 15:35:42 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 7e5eee5bf1 | Merge pull request #301 from emchristiansen:javasample2.4 | 2013-02-15 18:38:25 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Pavlenko | edb15dee3d | review feed-back considered | 2013-02-15 16:33:13 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Pavlenko | a8c2fc6908 | changing layout, adding ant and eclipse sections, more pictures | 2013-02-14 17:54:37 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | b44b920997 | Merge branch '2.4' | 2013-02-12 16:30:18 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Smorkalov | c7e7b77093 | Tutorial for Android synchronized with actual application framework. | 2013-02-08 16:53:06 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 61079547f0 | Merge branch '2.4' | 2013-02-01 14:59:40 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | acb2cb5bf0 | Merge pull request #389 from Daniil-Osokin:bugfix_doc_opencv_with_cmake | 2013-01-31 15:04:56 +04:00 |  | 
			
				
					| 
							
							
								 Daniil Osokin | b5ed86c6a1 | Fixed sample files in "Using OpenCV with gcc and CMake" tutorial (bug #2663, #2588) | 2013-01-31 13:26:29 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 7572b4d400 | Merge branch '2.4' | 2013-01-30 15:12:50 +04:00 |  | 
			
				
					| 
							
							
								 Daniil Osokin | 568591670c | Fixed color code in cvtColor in "Load, Modify, and Save an Image" tutorial (bug #2739) | 2013-01-30 08:16:47 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0734d9b877 | Merge branch '2.4' | 2013-01-29 14:16:07 +04:00 |  | 
			
				
					| 
							
							
								 Daniil Osokin | f9bff103dd | Removed obsolete steps from Windows installation tutorial (bug #2550) | 2013-01-28 17:46:03 +04:00 |  | 
			
				
					| 
							
							
								 Eric Christiansen | c2c2403a79 | Added a desktop Java tutorial | 2013-01-21 14:57:25 -08:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 084b1c7969 | Merge branch 2.4 | 2013-01-11 15:45:23 +04:00 |  | 
			
				
					| 
							
							
								 Vsevolod Glumov | c0411caef4 | Fixed a bunch of minor issues in 'dev_with_OCV_on_Android.rst'. | 2012-12-28 16:37:05 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 132b5d6435 | Merge release 2.4.3.2 | 2012-12-25 19:07:08 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Pavlenko | 1e5b533d01 | updating tutorial #2 | 2012-12-24 20:05:27 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Pavlenko | 99299b3605 | updating tutorial #1 | 2012-12-24 19:25:42 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 962884cdec | Merge branch 2.4 | 2012-12-21 17:58:48 +04:00 |  | 
			
				
					| 
							
							
								 Vsevolod Glumov | e9e46d3086 | Updated Android introductory tutorials, based on frequent Q&A questions/issues. | 2012-12-21 16:10:20 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Smorkalov | 3c09b075fc | OpenCV Manager selection chapter added to documentation. | 2012-12-18 18:34:51 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | e10ee89ec4 | Merge branch 2.4 | 2012-11-30 19:54:24 +04:00 |  | 
			
				
					| 
							
							
								 Vsevolod Glumov | 0711e65972 | Added a note to the android_dev_intro.rst. | 2012-11-27 15:10:57 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 0938358002 | Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix | 2012-11-13 19:47:16 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Smorkalov | 6fb959710d | Code review comments applied. | 2012-11-12 18:01:56 +04:00 |  | 
			
				
					| 
							
							
								 mikle | 7ef378b230 | Android tutorial updated. HelloWorld sample ported on new framework. | 2012-11-08 14:51:42 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 4d059e9e5b | Merge release 2.4.3 | 2012-11-02 17:58:02 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Pavlenko | 65c6b81cbc | Android Tutorial update (TADP link, Android SDK platforms, CDT) | 2012-11-02 16:11:08 +04:00 |  | 
			
				
					| 
							
							
								 Kirill Kornyakov | 2b7d65d078 | Updated OpenCV4Android SDK tutorial | 2012-11-01 22:28:46 +04:00 |  | 
			
				
					| 
							
							
								 Kirill Kornyakov | 61ed591728 | Updated Introduction into Android Development tutorial | 2012-11-01 22:28:46 +04:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | 849a8c8d20 | fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) | 2012-10-31 15:15:51 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 91f47d2779 | Merge branch '2.4' Conflicts:
	modules/core/include/opencv2/core/version.hpp | 2012-10-23 20:39:02 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 6f08d03322 | Advance version number to 2.4.3-rc | 2012-10-23 17:59:59 +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 |  | 
			
				
					| 
							
							
								 Kirill Kornyakov | aedf56404e | made imread description slightly better #2406 | 2012-10-15 15:23:38 +04:00 |  | 
			
				
					| 
							
							
								 Vsevolod Glumov | a2088d0c52 | Replaced SVN instructions with Git ones for 'Installation in Windows' section (Issue #2249); Also, fixed both bugs from issue #2374 in the same section. | 2012-10-11 18:37:00 +04:00 |  | 
			
				
					| 
							
							
								 Vsevolod Glumov | a3080636ba | Replaced SVN instructions with Git instructions in iOS and Linux installation tutorials. Issue #2249 + Minor formatting fixes. | 2012-10-11 16:44:53 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Smorkalov | 306ed9801a | Issue #2284 BaseLoaderCallback requires use of Activity fixed. | 2012-10-10 11:44:01 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Smorkalov | 9a76573172 | Auto expand of OpenCV version for Android Library prject and some documentation pages added. | 2012-10-09 18:30:58 +04:00 |  | 
			
				
					| 
							
							
								 Alexander Smorkalov | 9ab19691d4 | OpenCV Manager documentation updated. Diagram rendering script updated. | 2012-10-09 10:34:40 +04:00 |  | 
			
				
					| 
							
							
								 Vadim Pisarevsky | 3d4ca2d709 | added ios tutorials by Charu Hans and Eduard Feicho | 2012-08-30 15:49:53 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | bf4c1df0d0 | Fix formatting in Android tutorials | 2012-08-17 19:23:45 +04:00 |  | 
			
				
					| 
							
							
								 Andrey Kamaev | 9d6ccecfdd | Fixed layout in third Android tutorial | 2012-08-17 18:15:15 +04:00 |  | 
			
				
					| 
							
							
								 Vsevolod Glumov | 8899835886 | Reviewed 'android_dev_intro' | 2012-08-15 15:10:58 +04:00 |  |