diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:13:43 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:13:43 +0100 |
| commit | d8bf2fbfdb235627db32202bcc537ef9a487b284 (patch) | |
| tree | ab68662e35b8b243bb9e71ec29a877891ceb411f | |
| parent | aeda61b3d8bf17c07af56e06e232ad4070c4b8f2 (diff) | |
| parent | dde6daeccdf0a3f8d49fe1777b49046576b12218 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I2268e648a3d65f8ff6dbc0e954e0729a2e751664
0 files changed, 0 insertions, 0 deletions