summaryrefslogtreecommitdiff
path: root/src/plugins/script/qtdbus/main.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-27 18:42:16 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-02-27 18:42:16 +0100
commit35160ca46b46fe2c81a0400c455a9c500f14a150 (patch)
tree7318580e62f9a4a72c09e41f2e24ba23b4abc948 /src/plugins/script/qtdbus/main.cpp
parent3db429e2ce2cbe48a4a558080aaf1d0b81b220ef (diff)
parent781c745277f9b4faa87d341b10ec0ca46eb45a73 (diff)
downloadqtscript-35160ca46b46fe2c81a0400c455a9c500f14a150.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1155c2f71acd99b50695834c85bd8e6369258871
Diffstat (limited to 'src/plugins/script/qtdbus/main.cpp')
0 files changed, 0 insertions, 0 deletions