merged revisions r7802,r7804,r7805 from 2.4 branch
authorAlexander Shishkov <no@email>
Tue, 3 Apr 2012 00:33:33 +0000 (00:33 +0000)
committerAlexander Shishkov <no@email>
Tue, 3 Apr 2012 00:33:33 +0000 (00:33 +0000)
commit9bfd50e6aeb06d139b2176fb16ccd792080ddd11
tree73fe71d3dd87d9cf8ff522c3440533eecb569457
parent56b5e6d8a84f335cbd39897c33791efdbf4c4fd1
merged revisions r7802,r7804,r7805 from 2.4 branch
doc/_themes/blue/layout.html
doc/_themes/blue/static/default.css_t
doc/conf.py
doc/opencv-logo-white.png [new file with mode: 0644]
modules/highgui/src/cap_ffmpeg_impl_v2.hpp