Tony 46ba9d30b9 Merge remote-tracking branch 'upstream/master'		2014-03-25 20:44:06 +00:00
..
doc	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +04:00
include/opencv2	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-24 19:02:16 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge remote-tracking branch 'upstream/master'	2014-03-25 20:44:06 +00:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-03-03 13:45:22 +04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master'	2014-03-25 20:44:06 +00:00