diff options
author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:38:02 +0200 |
---|---|---|
committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:39:00 +0200 |
commit | ff8399920bbe272e573782e9b134e13f1726edb9 (patch) | |
tree | c84deaee9e240543eebd19a5e96e062a5ed141f5 /.qmake.conf | |
parent | 206897d96f337f139870a2eaf173543898e7cc29 (diff) | |
parent | 98cbd8ba0b1b91206ddd9cbf88ed4fc255e9aeb8 (diff) |
Merge branch 'stable' into release
Change-Id: I29715c906d4d4dee985fdcfbae9a5d99c1a17997
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions