diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-24 16:37:03 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-24 16:37:03 +1000 |
| commit | 2a18f33552d20b637989e876175c6bd03c69bc97 (patch) | |
| tree | 1bfe921c52dcebeaadf79511168db7d8164ee062 /examples/declarative/particles/launcherContent/icons/layered.png | |
| parent | 09b01b54f23fb10fd6b63398edf813a2bbd04cff (diff) | |
| parent | a9853d2ffe177bf98eb7610b58bb1bbb44743510 (diff) | |
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging
Conflicts:
src/declarative/items/qsgtextnode.cpp
Diffstat (limited to 'examples/declarative/particles/launcherContent/icons/layered.png')
| -rw-r--r-- | examples/declarative/particles/launcherContent/icons/layered.png | bin | 0 -> 8572 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/particles/launcherContent/icons/layered.png b/examples/declarative/particles/launcherContent/icons/layered.png Binary files differnew file mode 100644 index 0000000000..a28e3c4f02 --- /dev/null +++ b/examples/declarative/particles/launcherContent/icons/layered.png |