diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 13:22:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 13:22:26 (GMT) |
| commit | 65b05e330640a5e1920c61a4735cbc27a5ca3fe2 (patch) | |
| tree | 221f49ffdbdd6f2644c7f8f1ddf4a7e25a8a51d6 | |
| parent | c9a89b253176547901e11d27c042983a65f43b1f (diff) | |
| parent | ba910144d405977eb78ee86647ec68d7aef46f6b (diff) | |
| download | Qt-65b05e330640a5e1920c61a4735cbc27a5ca3fe2.zip Qt-65b05e330640a5e1920c61a4735cbc27a5ca3fe2.tar.gz Qt-65b05e330640a5e1920c61a4735cbc27a5ca3fe2.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Attribute change to allow inclusion of image files.
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/toys/clocks/content/center.png | bin | 765 -> 765 bytes |
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/toys/clocks/content/clock-night.png | bin | 23359 -> 23359 bytes |
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/toys/clocks/content/clock.png | bin | 20653 -> 20653 bytes |
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/toys/clocks/content/hour.png | bin | 625 -> 625 bytes |
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/toys/clocks/content/minute.png | bin | 625 -> 625 bytes |
| -rw-r--r--[-rwxr-xr-x] | examples/declarative/toys/clocks/content/second.png | bin | 303 -> 303 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/examples/declarative/toys/clocks/content/center.png b/examples/declarative/toys/clocks/content/center.png Binary files differindex 7fbd802..7fbd802 100755..100644 --- a/examples/declarative/toys/clocks/content/center.png +++ b/examples/declarative/toys/clocks/content/center.png diff --git a/examples/declarative/toys/clocks/content/clock-night.png b/examples/declarative/toys/clocks/content/clock-night.png Binary files differindex cc7151a..cc7151a 100755..100644 --- a/examples/declarative/toys/clocks/content/clock-night.png +++ b/examples/declarative/toys/clocks/content/clock-night.png diff --git a/examples/declarative/toys/clocks/content/clock.png b/examples/declarative/toys/clocks/content/clock.png Binary files differindex 462edac..462edac 100755..100644 --- a/examples/declarative/toys/clocks/content/clock.png +++ b/examples/declarative/toys/clocks/content/clock.png diff --git a/examples/declarative/toys/clocks/content/hour.png b/examples/declarative/toys/clocks/content/hour.png Binary files differindex f8061a1..f8061a1 100755..100644 --- a/examples/declarative/toys/clocks/content/hour.png +++ b/examples/declarative/toys/clocks/content/hour.png diff --git a/examples/declarative/toys/clocks/content/minute.png b/examples/declarative/toys/clocks/content/minute.png Binary files differindex 1297ec7..1297ec7 100755..100644 --- a/examples/declarative/toys/clocks/content/minute.png +++ b/examples/declarative/toys/clocks/content/minute.png diff --git a/examples/declarative/toys/clocks/content/second.png b/examples/declarative/toys/clocks/content/second.png Binary files differindex 4aa9fb5..4aa9fb5 100755..100644 --- a/examples/declarative/toys/clocks/content/second.png +++ b/examples/declarative/toys/clocks/content/second.png |
