diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:29:07 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:29:07 +0100 |
| commit | f217661e4c0c5c653442da65498c4a235a41b785 (patch) | |
| tree | 6b991c536ffe45cdd6b20b3855d273e55011aab3 /tests/auto/patternistexamples/patternistexamples.pro | |
| parent | ec28b7a1d2e2f0f6eec3a272ff86d1de494b2181 (diff) | |
| parent | ecf06489d90385cf2ca67dc5f70529f76421beae (diff) | |
| download | qtxmlpatterns-f217661e4c0c5c653442da65498c4a235a41b785.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I8a745d75ab994164aa861f5d5082e493b02eaea4
Diffstat (limited to 'tests/auto/patternistexamples/patternistexamples.pro')
0 files changed, 0 insertions, 0 deletions