diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-07-31 14:57:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-07-31 14:57:11 +0200 |
| commit | 5acd0f951ffbc1e46338ef972f83611a31aaab58 (patch) | |
| tree | 63a9e631279a6a26212f2ed9e51603d856dd8029 | |
| parent | 4e75905d01b6a8aac987613cd4798fff1126dd4a (diff) | |
| parent | a9858739d20831912bac7e4ae98fc2faa545edb3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/plugins/opcua/open62541/qopen62541valueconverter.cpp
Change-Id: If3c6681920c26ead27b5b14d066915db1736fed1
0 files changed, 0 insertions, 0 deletions