Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>
Thu, 28 Apr 2011 07:59:43 +0000 (09:59 +0200)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Thu, 28 Apr 2011 07:59:43 +0000 (09:59 +0200)
commit0d70b0a9faecf042fdb20e0056bdaaec289b851c
tree5ad6397fbab4dac6b37f740256aa585183e147c1
parentd45ec470519d1075ebf299b74cbb846a0c7d99af
parentce4996b624678f37b13fbb7db810cccd8970a889
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtGuiu.def