Merge remote-tracking branch 'qt/4.8'
authorJyri Tahtela <jyri.tahtela@nokia.com>
Fri, 13 May 2011 11:30:46 +0000 (14:30 +0300)
committerJyri Tahtela <jyri.tahtela@nokia.com>
Fri, 13 May 2011 11:30:46 +0000 (14:30 +0300)
commit50ea2454c0ad9b28be6dd5125c74466f0f96d16a
tree610e8b4852bca7d23ec5c4b9937a119eed96a124
parent0f750aec4507fffc06acea46a513c6d374564d6a
parenta80130b07c5b8ee4b06eabbceb65eb23d4d4602e
Merge remote-tracking branch 'qt/4.8'

Conflicts:
src/s60installs/eabi/QtOpenGLu.def