Merge branch 'devel' of https://github.com/f-morozov/opencv into devel
authorFedor Morozov <f-morozov@ya.ru>
Thu, 5 Sep 2013 10:49:18 +0000 (14:49 +0400)
committerFedor Morozov <f-morozov@ya.ru>
Thu, 5 Sep 2013 10:49:18 +0000 (14:49 +0400)
1  2 
modules/photo/test/test_hdr.cpp

Simple merge