After-merge corrections
authorAnna Kogan <anna.kogan@itseez.com>
Thu, 21 Nov 2013 11:45:53 +0000 (15:45 +0400)
committersiddharth <siddharthkherada27@gmail.com>
Wed, 4 Dec 2013 13:48:00 +0000 (19:18 +0530)
commit944f7bac42ac88dec6d92313720950fede6b373c
tree8c976b496db2a0de9c4428dfda14234fd8cacb5d
parent573e8184151e261c687db6fda5581fbabfdda907
After-merge corrections
modules/photo/include/opencv2/photo.hpp