Roman Donchenko fd3b2326b4 Merge pull request #1373 from abidrahmank:pykeypoints		2013-09-04 11:53:33 +04:00
..
doc	warning corrections	2013-08-30 15:58:10 +05:30
include/opencv2	Merge pull request #1373 from abidrahmank:pykeypoints	2013-09-04 11:53:33 +04:00
perf	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-02 19:44:51 +04:00
src	Merge pull request #1389 from SpecLad:merge-2.4	2013-09-03 19:42:06 +04:00
test	Merge pull request #1224 from mbarnach:pca_io	2013-09-03 18:43:54 +04:00
CMakeLists.txt	Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR.	2013-08-22 18:17:19 +04:00