diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:24:12 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:24:12 +0100 |
| commit | d2414abe66d4db2f3c5146466cdea66615b849a7 (patch) | |
| tree | 1108b92bc8f5d5d387b34bd65e89f19b79ac21b9 | |
| parent | affc5f7b3b6575974ceab1928f30851981d356ac (diff) | |
| parent | 281d54501ebf7088459354037b02746a7c77f3b6 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I0f21f35cbace3cacbb0b2536c8f1eb6e11f025b5
0 files changed, 0 insertions, 0 deletions