diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-16 07:06:56 (GMT) |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-06-16 07:06:56 (GMT) |
commit | 52c5ea949df2e635418a5542146d469fde8416a5 (patch) | |
tree | e8b53ad0a8c0366d84a5752ce88d14a79efa1aa1 /demos/embedded/fluidlauncher/screenshots | |
parent | 4f734500e1833d43805d39747f94bb77e47ebbe3 (diff) | |
parent | de3e3d6bff2b585524cd504cf052cf181a6c2eae (diff) | |
download | Qt-52c5ea949df2e635418a5542146d469fde8416a5.zip Qt-52c5ea949df2e635418a5542146d469fde8416a5.tar.gz Qt-52c5ea949df2e635418a5542146d469fde8416a5.tar.bz2 |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Conflicts:
demos/embedded/fluidlauncher/config_s60/config.xml
Diffstat (limited to 'demos/embedded/fluidlauncher/screenshots')
-rw-r--r-- | demos/embedded/fluidlauncher/screenshots/softkeys.png | bin | 0 -> 42853 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/demos/embedded/fluidlauncher/screenshots/softkeys.png b/demos/embedded/fluidlauncher/screenshots/softkeys.png Binary files differnew file mode 100644 index 0000000..99681b9 --- /dev/null +++ b/demos/embedded/fluidlauncher/screenshots/softkeys.png |