Andrey Kamaev 3a1f85d4e8 Remerged the 2.4.0 branch		2012-05-02 20:20:14 +00:00
..
doc	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
include/opencv2/highgui	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
perf	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
src	Remerged the 2.4.0 branch	2012-05-02 20:20:14 +00:00
test	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
CMakeLists.txt	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00