diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:59:44 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-08 13:59:45 +0100 |
| commit | 30e3ccc84031e5530ee38ab4a790267557067205 (patch) | |
| tree | 5020787cea694e0bb19860545ce69ff3a26b03da /.qmake.conf | |
| parent | 57e1ebecf0e9e1fbc23f7fe32a90c63e242e692b (diff) | |
| parent | 0e4b43383dd826b5927f6276033f52ede1fa7936 (diff) | |
| download | qtwebsockets-30e3ccc84031e5530ee38ab4a790267557067205.tar.gz | |
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I1b001ff2a374ec53a9247adc2d91db12ef2a8923
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions