diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:40:01 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:40:01 +0200 |
| commit | ab19bcfffc5b5074f9ff68903abeac1c14b576ac (patch) | |
| tree | aad9a01e855666dc05d09b8aa435d58ff52877a7 /src/3rdparty/libtiff/libtiff/tif_config.h | |
| parent | 20412631b3363866b764368cfd715dec6f148412 (diff) | |
| parent | c82bd369121a89fa999f41362ec904f00461b997 (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_config.h')
0 files changed, 0 insertions, 0 deletions