diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:33 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-16 15:29:33 +0200 |
| commit | 39242c4c57985c64c72b128bdf76c8e7df403351 (patch) | |
| tree | c7223b87dec11e43ae71f5932bf480b833ff651b | |
| parent | 33e7b0c07b8dbe818fbb697948367cadc92942df (diff) | |
| parent | 9e9bad4a6368f206ec585ba2c2bd73aa6d653fad (diff) | |
| download | qtsvg-39242c4c57985c64c72b128bdf76c8e7df403351.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
.qmake.conf
Change-Id: I4017abfde368e92640a3453fc1b7127d3efb1b7b
0 files changed, 0 insertions, 0 deletions