082faeff9c
Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qdialog.pro | ||
tst_qdialog.cpp |
082faeff9c
Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
---|---|---|
.. | ||
.gitignore | ||
BLACKLIST | ||
qdialog.pro | ||
tst_qdialog.cpp |