Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Sep 2011 13:03:40 +0000 (23:03 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Sep 2011 13:03:40 +0000 (23:03 +1000)
commit244ccf1cd7434b4f9ef4dbcdb39ae5c70610952c
tree2316d06ccf1d1d497a9b239223fe6a979ebcfda0
parent085bd7cf2d76f9acd548120f859201b014970a72
parenta14033620fab5edca44293ec6dfcc904e2e0eb20
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging:
  Sentences should end with a period! (Poor man's rebuild trigger.)
  Workaround MSVC2010 problems when linking QtWebKit
  dos2unix on a webkit source file (fix support for Visual Studio)