diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:42 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:42 +0100 |
| commit | 2f2ba9d199154732d942aa4c18874e40446919d5 (patch) | |
| tree | d573b969aef42cadae35d4a8309e0b7d7a5b17a1 /examples | |
| parent | 1490a408c4a360b92bf993e8a4c56cf96acd6033 (diff) | |
| parent | 39ccd598cd36b01e3b876f55030c639a9bc39687 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I1559e3cb17dd182f72e40ec75fcb987beb000f74
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions