diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-22 17:19:38 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-22 17:19:38 (GMT) |
commit | 5f2090f0f2280c32d06fbc5188ccb799d7b1a489 (patch) | |
tree | e34382edd780ffcf27ceb3f213c97fff0a5937f2 /examples/declarative/touchinteraction/gestures/experimental-gestures/qml | |
parent | 62081dfcf0ff09aac7fc13e0edf66c9925e60baa (diff) | |
parent | 81ae9027b72dcf3635d2fb9f20e63d60b35d62e8 (diff) | |
download | Qt-5f2090f0f2280c32d06fbc5188ccb799d7b1a489.zip Qt-5f2090f0f2280c32d06fbc5188ccb799d7b1a489.tar.gz Qt-5f2090f0f2280c32d06fbc5188ccb799d7b1a489.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:
Webkit: Work around C++11 string literal source incompatibility.
Add spaces for string concatenation to work around C++11 source incompatibility.
Diffstat (limited to 'examples/declarative/touchinteraction/gestures/experimental-gestures/qml')
0 files changed, 0 insertions, 0 deletions