diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:46:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:46:16 +0200 |
| commit | 4bbf21c05b1a51eab91ed8214349e48e211d4771 (patch) | |
| tree | a60524c09b4dd37b2d2083118d036d70d05e03f8 | |
| parent | 47e07d27e3c7f24dd25181288f5181afa125316b (diff) | |
| parent | e70056c224d5cb8706add78d725908d6497e9da0 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I7a53a0601021edff1cb5acb3e2f7924512a27e3c
0 files changed, 0 insertions, 0 deletions