diff options
| author | Rainer Keller <rainer.keller@nokia.com> | 2011-02-23 17:07:32 +0000 |
|---|---|---|
| committer | Rainer Keller <rainer.keller@nokia.com> | 2011-02-23 17:07:32 +0000 |
| commit | ca8ec7b2886db3bef3dcd2dc8fb8d91f900c7054 (patch) | |
| tree | d09a39c21c30733e2d1d0bba33441d56f754a3f2 /models | |
| parent | 0b30edad375b4532c07930c5b8e1bc197e972bf6 (diff) | |
| parent | eaae74d5bd250a4837f28bf59976aaabf1ee2156 (diff) | |
Merge remote-tracking branch 'origin/1.1'
Conflicts:
src/ui/accelerometercontrol.cpp
src/ui/accelerometercontrol.h
src/ui/locationui.cpp
src/ui/locationui.h
src/ui/mainwindow.cpp
src/ui/ui.qrc
Diffstat (limited to 'models')
| -rw-r--r-- | models/maemoFremantle/N900_back.png | bin | 0 -> 1157713 bytes |
| -rw-r--r-- | models/maemoFremantle/N900_left.png | bin | 0 -> 193023 bytes |
| -rw-r--r-- | models/maemoFremantle/N900_top.png | bin | 0 -> 324504 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/models/maemoFremantle/N900_back.png b/models/maemoFremantle/N900_back.png Binary files differnew file mode 100644 index 0000000..dc74ee1 --- /dev/null +++ b/models/maemoFremantle/N900_back.png diff --git a/models/maemoFremantle/N900_left.png b/models/maemoFremantle/N900_left.png Binary files differnew file mode 100644 index 0000000..3f6379b --- /dev/null +++ b/models/maemoFremantle/N900_left.png diff --git a/models/maemoFremantle/N900_top.png b/models/maemoFremantle/N900_top.png Binary files differnew file mode 100644 index 0000000..11365d9 --- /dev/null +++ b/models/maemoFremantle/N900_top.png |
