Andrey Kamaev 61079547f0 Merge branch '2.4'		2013-02-01 14:59:40 +04:00
..
doc	Merge branch 2.4	2013-01-17 18:39:20 +04:00
include/opencv2/stitching	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
perf	Increased time limits, eliminated extra params	2013-01-31 16:18:52 +04:00
src	Merge branch 2.4	2012-12-24 17:10:07 +04:00
test	Fix OS X build warnings	2012-11-09 11:29:52 +04:00
CMakeLists.txt	added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.	2012-03-31 17:25:19 +00:00