diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 19:37:33 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-08 19:37:33 (GMT) |
commit | 48b5fa29f5da3c241bc64520bd56ccd5713c4586 (patch) | |
tree | 2f812d575ee1e32ac60c391129ef25517fdec68f /src/xmlpatterns | |
parent | e2dcc68a6c8c94d7157c6ca662d1292f1dc295a4 (diff) | |
parent | 3110c9349503c2389f6aa4bcbfb78b28966549f1 (diff) | |
download | Qt-48b5fa29f5da3c241bc64520bd56ccd5713c4586.zip Qt-48b5fa29f5da3c241bc64520bd56ccd5713c4586.tar.gz Qt-48b5fa29f5da3c241bc64520bd56ccd5713c4586.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add average frame timing to QDeclarativeView, ifdef'ed out.
Diffstat (limited to 'src/xmlpatterns')
0 files changed, 0 insertions, 0 deletions