diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:55:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-01-19 13:55:16 +0100 |
| commit | a1897106ce1306c1083bff05493a760e11bd19c7 (patch) | |
| tree | d882a6ce210f7b685eea17aa711ee9929e46d019 /src/effects/ConicalGradient.qml | |
| parent | 974f84c7f50d7fd1628137845c51df3d3a80b3fe (diff) | |
| parent | 6eef4b5fa1836c9cb7ebc5dcb269a8d3114eb6c3 (diff) | |
| download | qtgraphicaleffects-a1897106ce1306c1083bff05493a760e11bd19c7.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: I4f99c72926a0d0ac0b79f89a0f8f4234685b0ac3
Diffstat (limited to 'src/effects/ConicalGradient.qml')
0 files changed, 0 insertions, 0 deletions