8 Commits

Author	SHA1	Message	Date
Vadim Pisarevsky	d5a0088bbe	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
Vadim Pisarevsky	2fd1e2ea57	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
Alexander Shishkov	fc68c18c92	unrolled changes from r7601 (problems with Android,...)	2012-03-22 13:36:07 +00:00
Alexander Reshetnikov	ce8c2892d8	Removed OS conditions from highgui tests	2012-03-22 09:38:44 +00:00
Alexander Reshetnikov	deee349ba7	removed highgui video tests execution on macos; also minor code changes	2012-02-15 12:06:46 +00:00
Alexander Reshetnikov	35c19442a7	updated 3 highgui tests	2012-02-11 15:28:03 +00:00
Alexander Reshetnikov	6ead21b1a2	added licenses to some tests; updated new highgui tests	2012-02-09 10:51:53 +00:00
Alexander Reshetnikov	b4895dbcaf	completed tests checking positioning & frame count for videos (C interface); added new test videos	2012-02-04 16:17:05 +00:00