summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/nla
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-05 01:00:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-12-05 01:00:44 +0100
commit2625d2713cfecca209d9a1423e1536825bf3a7cb (patch)
tree491e0f269d61b64cc72db8271f02567b9bbd9bcf /src/plugins/bearer/nla
parent8652c79df0a47264a2d525424484e15744e2462b (diff)
parentde6520805abafbc6f898b3fec043e5d85827dfd0 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/plugins/bearer/nla')
0 files changed, 0 insertions, 0 deletions