diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 14:48:27 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-21 14:49:37 +0200 |
commit | c94109e6123a2c04da5f31c91ede6a155b534f4e (patch) | |
tree | 673260662852d2776ad104a6394d3df02a8a37b9 /.qmake.conf | |
parent | 59a0e6f0b7e7c345b0328d9d66e503cfb1f94ebe (diff) | |
parent | 9aa0edc6d13d20796feb1712883eddb7cd411ecd (diff) | |
download | qtgraphicaleffects-c94109e6123a2c04da5f31c91ede6a155b534f4e.tar.gz qtgraphicaleffects-c94109e6123a2c04da5f31c91ede6a155b534f4e.tar.bz2 qtgraphicaleffects-c94109e6123a2c04da5f31c91ede6a155b534f4e.zip |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I64fdd5f0c14e0f07aa499aad5a3fea50d0b83ab4
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions