diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:22:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-19 16:25:31 +0200 |
| commit | 9aa0edc6d13d20796feb1712883eddb7cd411ecd (patch) | |
| tree | 75801a4abd760bd2a25a3a15e8de0d251e3584df | |
| parent | 9c9aadb04199e206e5c7bb6f39f8ae4aabc9c8bc (diff) | |
| parent | c7ed28bece292e2745e02663ef519c76d16ec762 (diff) | |
| download | qtgraphicaleffects-9aa0edc6d13d20796feb1712883eddb7cd411ecd.tar.gz qtgraphicaleffects-9aa0edc6d13d20796feb1712883eddb7cd411ecd.tar.bz2 qtgraphicaleffects-9aa0edc6d13d20796feb1712883eddb7cd411ecd.zip | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
Change-Id: I1d337a7aa19c3134ad784c726fc1055c06b3a3d2
0 files changed, 0 insertions, 0 deletions