summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativestyledtext
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-01 17:04:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-01 17:04:34 (GMT)
commite7dfec2b4a5f157112f0bace73ff8f58186106a6 (patch)
treea6b9147a1506a53f9ffae3f4c124536077896032 /tests/auto/declarative/qdeclarativestyledtext
parent49187bc691e67dca741d300e95d5fcde146d5118 (diff)
parent0f8e39459b47b99195eb677e7a32784b325834bd (diff)
downloadQt-e7dfec2b4a5f157112f0bace73ff8f58186106a6.zip
Qt-e7dfec2b4a5f157112f0bace73ff8f58186106a6.tar.gz
Qt-e7dfec2b4a5f157112f0bace73ff8f58186106a6.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix line endings
Diffstat (limited to 'tests/auto/declarative/qdeclarativestyledtext')
0 files changed, 0 insertions, 0 deletions