Merge pull request #5357 from fxtentacle:ha-2.4.11
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 21 Sep 2015 14:31:13 +0000 (14:31 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 21 Sep 2015 14:31:13 +0000 (14:31 +0000)
1  2 
modules/highgui/src/grfmt_tiff.cpp

Simple merge