Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Sep 2011 23:18:37 +0000 (09:18 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 22 Sep 2011 23:18:37 +0000 (09:18 +1000)
commit29cf5da6b1f0db349deb0a0842c0e57dd9a3783b
tree2316d06ccf1d1d497a9b239223fe6a979ebcfda0
parent758f9b94794e77326d74c65307cd753e852543f9
parent244ccf1cd7434b4f9ef4dbcdb39ae5c70610952c
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
  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)