Marina Kolpakova 54ee92e3b0 merged trunk r8815:8827		2012-06-28 17:28: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/nonfree	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
perf	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
src	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
test	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
CMakeLists.txt	merged trunk r8815:8827	2012-06-28 17:28:27 +00:00