Roman Donchenko 6133aeede8 Merge branch 'master' into merge-2.4 ... Conflicts: doc/tutorials/definitions/tocDefinitions.rst		2013-10-01 17:37:05 +04:00
..
doc	Merge remote-tracking branch 'upstream/master'	2013-09-26 23:08:23 +10:00
include/opencv2	Merge remote-tracking branch 'upstream/master'	2013-09-26 23:08:23 +10:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge branch 'master' into merge-2.4	2013-10-01 17:37:05 +04:00
test	Removed trailing whitespace	2013-10-01 21:03:54 +10:00
CMakeLists.txt	Global CMake reorganization:	2012-02-03 11:26:49 +00:00