diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:19:56 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:19:56 +0200 |
| commit | d949ef10665379fe45d9e1e196c72bd8710c7bec (patch) | |
| tree | 03849e6fef42185d07c6cc0b8b1737f644faf92b | |
| parent | 686b98e556361f70be11a308171227d0770825a6 (diff) | |
| parent | a441d816a082e15caf13400bfa8def4e4024ec00 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: I4c0a9ad9d5e5a28f9faf572279344d86af69fb4c
0 files changed, 0 insertions, 0 deletions