diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:10:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:10:15 +0100 |
| commit | 483bba7e93efa0bba2726ed1de923f330dc6b55a (patch) | |
| tree | 9c9d5bad94d998b594ae03c58d3f385b5e7b72ab | |
| parent | b584c8fa7390dd047ce29c4a2a69190ccbb17d4e (diff) | |
| parent | 39f11255247335531430ca129123f651e60ccd74 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I4e0d842ffc1a5d3cfd9fd9feca100083d666334d
0 files changed, 0 insertions, 0 deletions