Merge branch 'master' of https://github.com/f-morozov/opencv
authorFedor Morozov <f-morozov@ya.ru>
Tue, 6 Aug 2013 13:49:29 +0000 (17:49 +0400)
committerFedor Morozov <f-morozov@ya.ru>
Tue, 6 Aug 2013 13:49:29 +0000 (17:49 +0400)
commite914fc247111afec7946546f8a3701f3c010cf1c
tree193049c6ee2eed98d804628bedf410388de97cb5
parent4a4c5190f0a01f7433c5bfa8d59effcb0cebeed8
parent3c218717a98658995ccdccdb869cc6e8bd33c4bc
Merge branch 'master' of https://github.com/f-morozov/opencv
modules/photo/doc/hdr_imaging.rst