diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:39 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 14:07:39 +0100 |
| commit | 1db1fa1619e718eebdc88899df6c0a8c6d2309b9 (patch) | |
| tree | 5fcb4ea759967e906df54c07986111bad2137ea8 /qtwayland.pro | |
| parent | 101698bd0ffa3e51186eb14cfdb317526cc9512b (diff) | |
| parent | aaa97d529bbafe9d5637729126701794cbbf0fc1 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I65c8503cf632699129ebb6b4f01721b74be78def
Diffstat (limited to 'qtwayland.pro')
0 files changed, 0 insertions, 0 deletions