diff options
| author | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-12-21 14:24:22 (GMT) |
|---|---|---|
| committer | Aleksandar Sasha Babic <aleksandar.babic@nokia.com> | 2009-12-21 14:24:22 (GMT) |
| commit | 265f6d04813bad6938755ca88f8d9b699ddd757c (patch) | |
| tree | eb56d6aef322c0604be74c00e1394aba12736a06 /src/s60installs | |
| parent | 19ce714373bbf405e199e421e55673f1b8326ea7 (diff) | |
| parent | 71ee64f5a44dc310272b14fe6cd913b2e75672ed (diff) | |
| download | Qt-265f6d04813bad6938755ca88f8d9b699ddd757c.zip Qt-265f6d04813bad6938755ca88f8d9b699ddd757c.tar.gz Qt-265f6d04813bad6938755ca88f8d9b699ddd757c.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Conflicts:
src/gui/image/qpixmapfilter.cpp
Diffstat (limited to 'src/s60installs')
0 files changed, 0 insertions, 0 deletions