summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeflickable.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-10 20:34:57 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-10 20:34:57 (GMT)
commitdfc693e6854f337ec99f3af2b1c0bc9abde6c37b (patch)
tree7600e31df6ce715a5bc28c0c97983bac9484c7cb /src/declarative/graphicsitems/qdeclarativeflickable.cpp
parentec20a6da3edea3031f1705c3b13e24dc2c7c6de5 (diff)
parentab38731fe5dcfaa1a7a70bc290a8856b5b01524d (diff)
downloadQt-dfc693e6854f337ec99f3af2b1c0bc9abde6c37b.zip
Qt-dfc693e6854f337ec99f3af2b1c0bc9abde6c37b.tar.gz
Qt-dfc693e6854f337ec99f3af2b1c0bc9abde6c37b.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: My 4.7.2 changes
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable.cpp')
0 files changed, 0 insertions, 0 deletions