diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 16:42:20 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-17 16:42:20 +0100 |
commit | 85654ad96a6ae1556292ae31392f296e90e25156 (patch) | |
tree | 068d4e12362dd79469e860040b969e82c449cc13 /.qmake.conf | |
parent | 1fab918af9924bd3f7fc07332319232f8622d25a (diff) | |
parent | e6a813c7869fb3677b15b3907bd6647b5f80bd5e (diff) | |
download | qtx11extras-85654ad96a6ae1556292ae31392f296e90e25156.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I1e627b4485ff27c4f4e70bab119cd8319bc2d30f
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions