aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorEike Ziller <[email protected]>2022-07-20 11:53:36 +0200
committerEike Ziller <[email protected]>2022-07-20 12:03:40 +0200
commit3ec87e37ee5fa42ea217e840c6ec9748e8b8b898 (patch)
tree3ae63a692792c467244d529ce68671b5daacb263 /scripts
parent034acdeeb2198b5a0b8748c0e7a78aa356f2754e (diff)
parente1b0ba2473abd61263482349cfcc16ebef55af11 (diff)
Merge remote-tracking branch 'origin/8.0'
Conflicts: src/plugins/todo/optionsdialog.cpp src/plugins/todo/todoprojectsettingswidget.cpp Change-Id: I24ca90c2fc2cd707df901d42694df6d0e27d696d
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions