Tony 34984328fd Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	CMakeLists.txt

2014-04-10 08:07:02 +01:00

..

doc

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-03-24 19:02:16 +04:00

include/opencv2

added jpeg with optimized coding support.

2014-03-27 13:34:33 -04:00

perf

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

src

Merge remote-tracking branch 'upstream/master'

2014-04-06 11:49:23 +01:00

test

cv2cvtest part2

2014-04-09 13:08:51 +04:00

CMakeLists.txt

Merge remote-tracking branch 'upstream/master'

2014-03-25 20:44:06 +00:00