diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:27:40 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:27:40 +0200 |
| commit | c11187abd24cc20cf9d45a72189d4171f1b170ce (patch) | |
| tree | 83ecb7f36fd9bee1a10c8df01667acf1e875d7ac | |
| parent | d098ff07179ecc49f75f3070390b7391ebd9da6e (diff) | |
| parent | 66444e54dd2aa4554cb0d7ac67601dfc8bf3e272 (diff) | |
| download | qtsvg-c11187abd24cc20cf9d45a72189d4171f1b170ce.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I014c0a4779038dd5c193208513c99d88d8b14496
0 files changed, 0 insertions, 0 deletions