Marina Kolpakova 6cca6a4548 merged the trunk r8669:8702		2012-06-28 15:41:27 +00:00
..
doc	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
include/opencv2/contrib	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
src	merged the trunk r8669:8702	2012-06-28 15:41:27 +00:00
test	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00