diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:50:58 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:50:58 +0200 |
commit | 80feddafd32fdbf7c641cb897769d791c97a4196 (patch) | |
tree | 736aecb04f33928babb7e3008142caa86709b5c2 /LICENSE.LGPLv3 | |
parent | d521adcbb748c3eec33b0bc939f8bf59e9a0d960 (diff) | |
parent | 9af049f15178ab1b3237b6068397aa4207f2a14e (diff) |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: I409a2a711361d3ccb7ffcecf5bfb1820afa64338
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions