diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:25:31 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:25:31 +0200 |
| commit | 9576028934cbd3261345e944b55dd2e6ca1c62b8 (patch) | |
| tree | f6de1e0c2e68a5256d807ab81aebe151e4aff66f | |
| parent | 18b98775a453325d0e8f1cf8cffe4ac9cd4e0062 (diff) | |
| parent | b47a702e524f03f47ab3da95650fb635793f9d0f (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ibcd05d8dcf19133830920d9eba3fa1450b3d3de1
0 files changed, 0 insertions, 0 deletions