Marina Kolpakova 6cca6a4548 merged the trunk r8669:8702		2012-06-28 15:41:27 +00:00
..
doc	backported API for storing OpenCV data structures to text string and reading them back (r8481, r8516, r8518, r8522)	2012-05-31 10:25:29 +00:00
include/opencv2/core	merged the trunk r8669:8702	2012-06-28 15:41:27 +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 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	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00