aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-05-23 15:34:05 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-05-23 15:34:05 +1000
commit036cdbf1e128ecb4c5563087591958df93a52459 (patch)
tree233ebb08486676aeb1006b32472712f5fff5cc08 /src
parent72820b4c460d65237a014a0be074ec0a05af01ea (diff)
parent08fe14ab4113347cdf982fe11b9bc447bb0c168b (diff)
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions