summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-16 13:23:45 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-11-16 13:23:45 +0100
commita9929ae7700ba6e3a1627a65fb7064b1ba2f0d83 (patch)
tree32c01950125162b6eddad460a682babd6a4ca66b
parente08f9393acc6417598f328d7f4b7b082c5d57afa (diff)
parentaf06f4fbf76ef6168529f5de4480d4afd2cf204b (diff)
downloadqtxmlpatterns-a9929ae7700ba6e3a1627a65fb7064b1ba2f0d83.tar.gz
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: .qmake.conf Change-Id: Ice7a60f230736fb86f4044d79831ff9d41b3d297
0 files changed, 0 insertions, 0 deletions