summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-15 02:31:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-15 02:31:44 (GMT)
commit05ab8ad1577fc038aa2b3bd96cedda54e6a64979 (patch)
treeec0989e1267bdd518040147680e7567ee39931c8 /doc/src
parent4ef087e5ecd19286b6f43b07f4e47da4f1ae036f (diff)
parenta2c73d3f0305847343d5015c095073eae0ead197 (diff)
downloadQt-05ab8ad1577fc038aa2b3bd96cedda54e6a64979.zip
Qt-05ab8ad1577fc038aa2b3bd96cedda54e6a64979.tar.gz
Qt-05ab8ad1577fc038aa2b3bd96cedda54e6a64979.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Rename "interface" in qdeclarativeinterface.h to "qmlInterface"
Diffstat (limited to 'doc/src')
0 files changed, 0 insertions, 0 deletions