diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-02 17:01:13 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-02 17:01:13 (GMT) |
| commit | 20cfe1e790295254370cf472df39813f864de7ea (patch) | |
| tree | 98ac008f7c468ed37a61c051870810db2bbf2360 /demos/embedded/desktopservices | |
| parent | 83e497fdae56e11c79d913cdc665e78615291e9c (diff) | |
| parent | 2ed925753cb194970712330edca4da8e91fa8f28 (diff) | |
| download | Qt-20cfe1e790295254370cf472df39813f864de7ea.zip Qt-20cfe1e790295254370cf472df39813f864de7ea.tar.gz Qt-20cfe1e790295254370cf472df39813f864de7ea.tar.bz2 | |
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'demos/embedded/desktopservices')
| -rw-r--r-- | demos/embedded/desktopservices/data/designer.png | bin | 4205 -> 2529 bytes |
| -rw-r--r-- | demos/embedded/desktopservices/data/sax.mp3 | bin | 417844 -> 104104 bytes |
| -rw-r--r-- | demos/embedded/desktopservices/resources/browser.png | bin | 2739 -> 2525 bytes |
| -rw-r--r-- | demos/embedded/desktopservices/resources/message.png | bin | 2234 -> 1989 bytes |
| -rw-r--r-- | demos/embedded/desktopservices/resources/music.png | bin | 2322 -> 2123 bytes |
| -rw-r--r-- | demos/embedded/desktopservices/resources/photo.png | bin | 2430 -> 2233 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/demos/embedded/desktopservices/data/designer.png b/demos/embedded/desktopservices/data/designer.png Binary files differindex 0988fce..1485efa 100644 --- a/demos/embedded/desktopservices/data/designer.png +++ b/demos/embedded/desktopservices/data/designer.png diff --git a/demos/embedded/desktopservices/data/sax.mp3 b/demos/embedded/desktopservices/data/sax.mp3 Binary files differindex 0a078b1..d77c817 100644 --- a/demos/embedded/desktopservices/data/sax.mp3 +++ b/demos/embedded/desktopservices/data/sax.mp3 diff --git a/demos/embedded/desktopservices/resources/browser.png b/demos/embedded/desktopservices/resources/browser.png Binary files differindex 28561e1..9ecda6b 100644 --- a/demos/embedded/desktopservices/resources/browser.png +++ b/demos/embedded/desktopservices/resources/browser.png diff --git a/demos/embedded/desktopservices/resources/message.png b/demos/embedded/desktopservices/resources/message.png Binary files differindex e30052b..78917c7 100644 --- a/demos/embedded/desktopservices/resources/message.png +++ b/demos/embedded/desktopservices/resources/message.png diff --git a/demos/embedded/desktopservices/resources/music.png b/demos/embedded/desktopservices/resources/music.png Binary files differindex 11a57bb..cc569cb 100644 --- a/demos/embedded/desktopservices/resources/music.png +++ b/demos/embedded/desktopservices/resources/music.png diff --git a/demos/embedded/desktopservices/resources/photo.png b/demos/embedded/desktopservices/resources/photo.png Binary files differindex 5ba15c1..ac81cf3 100644 --- a/demos/embedded/desktopservices/resources/photo.png +++ b/demos/embedded/desktopservices/resources/photo.png |
