Andrey Kamaev d849f51023 Android camera: commented logs in frame callback		2012-08-24 16:55:12 +04:00
..
doc	svn repository web references are replaced with links to git	2012-08-24 15:59:43 +04:00
include/opencv2/highgui	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
perf	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
src	Android camera: commented logs in frame callback	2012-08-24 16:55:12 +04:00
test	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
CMakeLists.txt	Merged recent changes from trunk - 8833,8848,8850	2012-06-29 07:52:34 +00:00