Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 11:45:19 +0000 (21:45 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 11 Apr 2011 11:45:19 +0000 (21:45 +1000)
commitd2b05885a28aafa331b25cdf3b647b782605df08
tree51d6d6623b7309e2768c3715f39dce217c15d93a
parentad95cfc5d6239ce25d8afbc2dc01a58b9b1bd8b4
parentaa5be2cf2d0019a34855345e2497faa5c85c9fc7
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Updated QtOpenGL DEF file
  Updated QtOpenVG DEF file
  Updated QtGui DEF file for ARMV5
  Updated DEF files