Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
authorQt Continuous Integration System <qt-info@nokia.com>
Tue, 22 Nov 2011 00:10:26 +0000 (10:10 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 22 Nov 2011 00:10:26 +0000 (10:10 +1000)
commit4342a11d38bafdd18510de08abb94f965c384e0a
treedec23f1ea78a2d57f2cfcf69f3ed34c1efd7a967
parent1d4ecf45316e2fcce40acbf659b59df8ab17aafd
parent93e86e8eb49e15ef33d080264f13e928a594a83b
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:
  Add spaces for string concatenation to work around C++11 source incompatibility.