diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:10:09 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:10:09 +0200 |
commit | b84f22a3249aa1af46b17e33ac030abb077251bf (patch) | |
tree | 315d6c8151598a3a3bbad6d4a4161d08bb51a689 /.qmake.conf | |
parent | 4fda82b66e17cc03e6b08f1afd135069cfef09b7 (diff) | |
parent | 23cd16ad672a3d07da00d14276a63901d8d9f118 (diff) | |
download | qtwebchannel-b84f22a3249aa1af46b17e33ac030abb077251bf.tar.gz |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: If663d043ad0da98731e436309d3b40e3379b0831
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions