diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:01 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:01 +0200 |
| commit | d098ff07179ecc49f75f3070390b7391ebd9da6e (patch) | |
| tree | 83ecb7f36fd9bee1a10c8df01667acf1e875d7ac /LICENSE.GPL | |
| parent | 90c3421846e1ea51b0048122e29bcc890d691cab (diff) | |
| parent | 35a2f0880831d38c60d2b4820dac808f48f6f3a8 (diff) | |
| download | qtsvg-d098ff07179ecc49f75f3070390b7391ebd9da6e.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ic8f6fce9251acf4fbd0e7d5c3996ab2defb81107
Diffstat (limited to 'LICENSE.GPL')
0 files changed, 0 insertions, 0 deletions