diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:26 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:26 +0200 |
| commit | 50956f5476487ee10b1d3a8e339ea3e3222f883d (patch) | |
| tree | b21758e348ec4ba4e49de9a0316166c6414e478e /.qmake.conf | |
| parent | eb0dd8763c235b027bea91d5ec7fd82f06cacbab (diff) | |
| parent | c0aebf3dfe3c6837db8f91d65ac4b6b7b44e100e (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I913394721091750d64dad3ed0fd08ef8616edcf9
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions