diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:03:08 +0100 |
| commit | 713e1b66e35e08bd05b5ed0684665d068366ff7f (patch) | |
| tree | 32b7e78cf7d18b7ed2396a3c9b82055f97dd389a | |
| parent | af368200c2ea17c64abae30ebcb3b08399b32861 (diff) | |
| parent | e8c1b8423a0e2b36adcf4e238a2bbcb90c731d30 (diff) | |
| download | qtgraphicaleffects-713e1b66e35e08bd05b5ed0684665d068366ff7f.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I194516b948b437c85f0c6f93a1b0b339a4a76bb9
0 files changed, 0 insertions, 0 deletions