diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-10-06 10:14:36 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-06 10:14:36 +0200 |
| commit | 7971c377ee271ceae3e2d85847ae93224ac41d2e (patch) | |
| tree | e685e5819d1da47de2224af793b623d07aaf555c | |
| parent | f0b7d592f8ebd12e63b396732b1176e8a45d531b (diff) | |
| parent | 5bc72f880ddab4a3c7090ac57ce36cc9d70fb3d5 (diff) | |
Merge remote-tracking branch 'origin/4.4' into 4.5
Conflicts:
app/main.cpp
Change-Id: Ic3cd7ca4b5434b01187a2daa060818de0b31f3d5
0 files changed, 0 insertions, 0 deletions