diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:31:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:31:08 +0200 |
| commit | a01c1455afecc2a98598a574f69ce682586357ff (patch) | |
| tree | c97b5df394e9ecffaac12f5f37d702e7759db369 /tests/auto/auto.pro | |
| parent | bb684104f8d5c619a3e55f8b6cfa259cc154016b (diff) | |
| parent | 02e0e2a9770448a2f2a988b145590ff4a0b86b81 (diff) | |
| download | qtwebsockets-a01c1455afecc2a98598a574f69ce682586357ff.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I3f9a7c0afccb925e1b821ca7191dab4e1855cc21
Diffstat (limited to 'tests/auto/auto.pro')
0 files changed, 0 insertions, 0 deletions