diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /examples/declarative/imageelements/content/speaker.png | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'examples/declarative/imageelements/content/speaker.png')
| -rw-r--r-- | examples/declarative/imageelements/content/speaker.png | bin | 0 -> 784525 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/imageelements/content/speaker.png b/examples/declarative/imageelements/content/speaker.png Binary files differnew file mode 100644 index 0000000000..fb0e857859 --- /dev/null +++ b/examples/declarative/imageelements/content/speaker.png |
