diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:58:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-20 15:58:39 +0100 |
| commit | ed570c4835034bbdf36b74731da3d937d3063285 (patch) | |
| tree | 272c576c02069506e90b7c219da19a575c43b14b /src/svg/qsvgwidget.h | |
| parent | 8171769a728b094e1996a3449ce2d63230c4704a (diff) | |
| parent | 1fb79c9f2b50294b989cf2bdd8bfaaf0a458e2a8 (diff) | |
| download | qtsvg-ed570c4835034bbdf36b74731da3d937d3063285.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
LICENSE.GPLv2
Change-Id: Id7e321e81c3b3af0c17c9d32d25c0bb905974728
Diffstat (limited to 'src/svg/qsvgwidget.h')
0 files changed, 0 insertions, 0 deletions