diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:59 +0100 |
| commit | 422099e8ddeddc0631db3a369e3c52f0ffe2f455 (patch) | |
| tree | a38d0a77e8082c52072e9054b4399090405fcf31 /LICENSE.LGPL | |
| parent | 16aadf964dcdb71733414afdc7a548ca1ac58f97 (diff) | |
| parent | 88ef2bf83de18542428151553cbfa87de2469c90 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
Diffstat (limited to 'LICENSE.LGPL')
0 files changed, 0 insertions, 0 deletions