diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-08 14:51:11 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-08 14:51:41 +0300 |
| commit | fad870b6e606d44aeb8475c2c6ec33d4c21ec752 (patch) | |
| tree | 771cd031e8fdeddfb6d1e1142b14efb2d77eb242 /.qmake.conf | |
| parent | e9ac06074db9804fc5d717bcc4ae503b70616fe7 (diff) | |
| parent | 39772d9da1bdb62142214a91f67027b5fb825869 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
39772d9 Fix static ip address showing after reconnection
Change-Id: I534bd8b4877893750fb902238bb8ff44394b8286
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions