diff options
author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-17 10:29:59 +0300 |
---|---|---|
committer | Qt Gerrit Server <srv.gerrit-noreply@digia.com> | 2015-06-17 10:29:59 +0300 |
commit | b8b197a757c4cc7cf013d169c82d77f2832ebc71 (patch) | |
tree | 5665526b6a4a2fdc5db4d231c253ed7e45679e6d /.qmake.conf | |
parent | 544a762ca529bf25ab8f475dab3d696faba6bdfe (diff) | |
parent | f8738120d5085e13752e69fa9eb46bb10fcc8111 (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into dev
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions