summaryrefslogtreecommitdiffstats
path: root/demos/qtdemo
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-11-21 18:22:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-11-21 18:22:35 (GMT)
commitc70a08da7112d444268eec75421a9a840f6c8c9a (patch)
tree0f402d54bfebe050adaf6b9cac70567ac9c0fb55 /demos/qtdemo
parent75792528141ebf3dc6f36f2efcd771dfaef6e703 (diff)
parent6d9bdc5038644ccef2eb2da3cd46522de5904974 (diff)
downloadQt-c70a08da7112d444268eec75421a9a840f6c8c9a.zip
Qt-c70a08da7112d444268eec75421a9a840f6c8c9a.tar.gz
Qt-c70a08da7112d444268eec75421a9a840f6c8c9a.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add spaces for string concatenation to work around C++11 source incompatibility.
Diffstat (limited to 'demos/qtdemo')
0 files changed, 0 insertions, 0 deletions