Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
|---|---|---|
| .. | ||
| XML-Test-Suite | ||
| data | ||
| .gitattributes | ||
| .gitignore | ||
| XML-Test-Suite-LICENSE.txt | ||
| qc14n.h | ||
| qxmlstream.pro | ||
| setupSuite.sh | ||
| tst_qxmlstream.cpp | ||
Conflicts: src/gui/image/qpnghandler.cpp Change-Id: I8630f363457bb613d8fb88470a71d95d97cdb301 |
||
|---|---|---|
| .. | ||
| XML-Test-Suite | ||
| data | ||
| .gitattributes | ||
| .gitignore | ||
| XML-Test-Suite-LICENSE.txt | ||
| qc14n.h | ||
| qxmlstream.pro | ||
| setupSuite.sh | ||
| tst_qxmlstream.cpp | ||