diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-30 12:00:56 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-30 12:00:56 +0200 |
commit | e256394f698f207592844b97a62a4ee6f4bf82a9 (patch) | |
tree | 7b9bcd283c56b26482ac5a14ee80bf62965c073c /.qmake.conf | |
parent | d006acd43dc377b3085a53c6ef7a97a4ee959391 (diff) | |
parent | 8ccabef904b719f9409ee20ffb516028bf6f392b (diff) | |
download | qttranslations-e256394f698f207592844b97a62a4ee6f4bf82a9.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ia1529815a48ccaabaab6cc3c7972ed00ed0a44f0
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions