Andrey Pavlenko af8a03e17f Merge pull request #1222 from philippefoubert:branch_2.4_pvapi		2013-08-05 10:20:25 +04:00
..
doc	Added sample links in documentation for python2, ocl and gpu	2013-08-02 14:05:08 +02:00
include/opencv2/highgui	Merge pull request #1063 from alekcac:conversion	2013-06-28 14:41:35 +04:00
perf	Perf test failure fixes for Media Foundation.	2013-06-25 03:35:57 -07:00
src	Merge pull request #1098 from SeninAndrew:ximea_camera_bw_fix	2013-07-30 17:50:50 +04:00
test	Remove HAVE_CVCONFIG_H - it's always defined.	2013-07-10 16:02:07 +04:00
CMakeLists.txt	Merge pull request #1222 from philippefoubert:branch_2.4_pvapi	2013-08-05 10:20:25 +04:00