Tony 41b8ab086b Merge remote-tracking branch 'upstream/master'

2014-03-27 19:32:05 +00:00

..

doc

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

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

include/opencv2

Merge pull request #2378 from ngryman:progressive_jpeg

2014-03-26 12:12:02 +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-03-27 19:32:05 +00:00

test

Merge pull request #2378 from ngryman:progressive_jpeg

2014-03-26 12:12:02 +04:00

CMakeLists.txt

Merge remote-tracking branch 'upstream/master'

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