diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:09:14 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:09:14 +0100 |
| commit | d883ed46150cdebef5fe469d7f5c22c7ae94f11b (patch) | |
| tree | 9bbed2bc08d0222ee35d38d9998f6952c7d16b8c /src/xmlpatterns/parser | |
| parent | a6285b0447553732e25aecfcdfee727291ba2637 (diff) | |
| parent | 624e7d7bcdcd1f5e5f73faf07f7c19c6f0e04160 (diff) | |
| download | qtxmlpatterns-d883ed46150cdebef5fe469d7f5c22c7ae94f11b.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I0b0d5044d34bc915614253e89fb6029d6bfb75f7
Diffstat (limited to 'src/xmlpatterns/parser')
0 files changed, 0 insertions, 0 deletions