diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:55 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:55 +0100 |
commit | 29e29b42af59c4200051220b21d65a3bc54154a1 (patch) | |
tree | 536dfd3753991ac5428c7afb8b8302bbaf3e2430 /.qmake.conf | |
parent | dda7f305c4410f2d4135677fa4ee353c96d3c54a (diff) | |
parent | 01754de4776905205d38d7bc66fa7b7caa0fe79b (diff) | |
download | qtx11extras-29e29b42af59c4200051220b21d65a3bc54154a1.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I6d27c3ef1242de08a8b9b6ee619c942982d3384c
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions