diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:21:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:21:53 +0200 |
commit | 38b83c33f3955570627f0235fa920b2b54440bdc (patch) | |
tree | f94fd0b5d7f6408fbc810808b0f53b9f4cb63cde | |
parent | eb53c36aedf384f7e7eeee9dd543c4b1d21f0161 (diff) | |
parent | 42b878b16157fdbe9fb0254459536f00abb194b5 (diff) |
Conflicts:
.qmake.conf
Change-Id: Id1e361a9a0ce78700acd839a0411d608ab15a442
0 files changed, 0 insertions, 0 deletions