diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-01 16:33:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-01 16:33:43 +0100 |
| commit | a43e7b4d930591cfb63ad75a7dabcb44e02901ae (patch) | |
| tree | 0db1a88577ed07ed8230d1e1d40008b49c789295 /mkspecs/features/resources.prf | |
| parent | 920472c85f6a5cd96344c28dbba0f199c34c6c10 (diff) | |
| parent | a40ea0948d9af25fbfe80c53b0e23747e84ba9e8 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6.0
Change-Id: Ie58c80cf612efe1aa08a837f112437a87a844276
Diffstat (limited to 'mkspecs/features/resources.prf')
0 files changed, 0 insertions, 0 deletions