diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:38 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-01 21:57:38 +0200 |
commit | c4b8dee6b4cfdc6728094d237d7984791e2cecea (patch) | |
tree | 884d11acf657ec14e478843b691dc84bc9ae8cd2 /src/tools/sdpscanner/main.cpp | |
parent | aabce3a08d1a65f8abc4872bd91a6dfd45cf7fd6 (diff) | |
parent | e53f828a1644fab1821a7696c190777a3bbb1880 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ie9b0ebf1c5e925107e90b5d01b112916a8d1d83d
Diffstat (limited to 'src/tools/sdpscanner/main.cpp')
0 files changed, 0 insertions, 0 deletions