diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:08:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-15 11:08:01 +0100 |
| commit | db90e6d410314c33aff7031f98d178cdafdda678 (patch) | |
| tree | 31f18e12e90513220c6f922eeca34107f626886b /.qmake.conf | |
| parent | 9a0a655b51086045ce86c9d001d34738d84d27ff (diff) | |
| parent | b4bac09b3b2f0c3072d797b22c44e20b661c4723 (diff) | |
| download | qtwebsockets-db90e6d410314c33aff7031f98d178cdafdda678.tar.gz | |
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: Ieab7b2a7ecca2c3d79424f1fabeca3cdb2277def
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions