summaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols/controls/texteditor/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-28 10:49:58 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-28 10:49:58 +0200
commitb31d58be194c205decf087dacdc6bdb5cf443d71 (patch)
treefd3b24155e261a7cc0e45e65a31882c23c4dbf93 /examples/quickcontrols/controls/texteditor/src
parent44fe49e573539e22709c2d5c996f1ca9ee8fd760 (diff)
parentafd3352889d9e92063f5894984ff08c04418147b (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'examples/quickcontrols/controls/texteditor/src')
0 files changed, 0 insertions, 0 deletions