diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
| commit | 250763ffb5cef2173b80b0e67266c937850ff516 (patch) | |
| tree | 1de5e73b20a714c2cd32565873e6f3712a699c0d /src/declarative/particles/defaultshaders/defaultFadeInOut.png | |
| parent | 8bb487e60899382f0890fd675eb272d5cc562882 (diff) | |
| parent | 2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b (diff) | |
Merge branch 'qtquick2' into v8
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/declarative/particles/defaultshaders/defaultFadeInOut.png')
| -rw-r--r-- | src/declarative/particles/defaultshaders/defaultFadeInOut.png | bin | 0 -> 286 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/declarative/particles/defaultshaders/defaultFadeInOut.png b/src/declarative/particles/defaultshaders/defaultFadeInOut.png Binary files differnew file mode 100644 index 0000000000..89c04eaefe --- /dev/null +++ b/src/declarative/particles/defaultshaders/defaultFadeInOut.png |