Marina Kolpakova 162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811		2012-06-28 17:07:17 +00:00
..
15-puzzle	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
color-blob-detection	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
face-detection	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
hello-android	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00
image-manipulations	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00
tutorial-0-androidcamera	Merged the trunk r8345:8376	2012-05-18 13:18:37 +00:00
tutorial-1-addopencv	Merged the trunk r8345:8376	2012-05-18 13:18:37 +00:00
tutorial-2-opencvcamera	Merged the trunk r8345:8376	2012-05-18 13:18:37 +00:00
tutorial-3-native	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00
tutorial-4-mixed	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00
CMakeLists.txt	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
fix_properties.bat	merged the trunk r8669:8702	2012-06-28 15:41:27 +00:00
fix_properties.sh	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
includeOpenCV.mk	Android samples are included into the Android package	2011-07-14 09:34:57 +00:00