diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:45 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-16 13:23:45 +0100 |
commit | a9929ae7700ba6e3a1627a65fb7064b1ba2f0d83 (patch) | |
tree | 32c01950125162b6eddad460a682babd6a4ca66b /src/xmlpatterns/doc/qtxmlpatterns.qdocconf | |
parent | e08f9393acc6417598f328d7f4b7b082c5d57afa (diff) | |
parent | af06f4fbf76ef6168529f5de4480d4afd2cf204b (diff) | |
download | qtxmlpatterns-a9929ae7700ba6e3a1627a65fb7064b1ba2f0d83.tar.gz |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
.qmake.conf
Change-Id: Ice7a60f230736fb86f4044d79831ff9d41b3d297
Diffstat (limited to 'src/xmlpatterns/doc/qtxmlpatterns.qdocconf')
0 files changed, 0 insertions, 0 deletions