Roman Donchenko 79fcc06a4b Merge pull request #2146 from SpecLad:merge-2.4		2014-01-17 16:28:30 +04:00
..
doc	Doc fix.	2014-01-16 16:30:54 +02:00
include/opencv2	Small fixes: typo, spacing and using ::ScreenToClient() instead of ::GetWindowRect()	2014-01-16 11:09:25 +02:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Merge pull request #2146 from SpecLad:merge-2.4	2014-01-17 16:28:30 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-12-23 18:50:17 +04:00