Merge branch 'master' of https://github.com/f-morozov/opencv
authorAlexander Shishkov <alexander.shishkov@itseez.com>
Tue, 6 Aug 2013 11:41:39 +0000 (15:41 +0400)
committerAlexander Shishkov <alexander.shishkov@itseez.com>
Tue, 6 Aug 2013 11:41:39 +0000 (15:41 +0400)
1  2 
modules/photo/doc/hdr_imaging.rst

Simple merge