Merge remote-tracking branch 'origin/2.4' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Apr 2014 08:08:21 +0000 (12:08 +0400)
commit47d903d9687477f99e0b19e691ea57b03344a24c
treeceb6f1b5359bca5bd68311ed4566ac307d321175
parent32b25de5833a84d2bca6046621852c4cdc8975b3
parent5042ab1f32e7d9d728ae2862ad5a4f34b9f7ca17
Merge remote-tracking branch 'origin/2.4' into merge-2.4
modules/highgui/doc/reading_and_writing_images_and_video.rst