diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:08:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:08:48 +0100 |
| commit | ae9094316c593cfe210fb193052d9640cae79cea (patch) | |
| tree | 9fff0bbaa1fa3350e77e3fd550c7aa7d1d31169e | |
| parent | ea5e795d2d25e2950597ebd5aef8732ab65c92b9 (diff) | |
| parent | 00dd0582d1f31ae1d3e820d04790e31ad64f272a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ib1ccb9d61eee5fc4d007eb19298d4a95ee821b51
0 files changed, 0 insertions, 0 deletions