summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2011-02-02 06:26:58 (GMT)
committerMartin Jones <martin.jones@nokia.com>2011-02-02 06:26:58 (GMT)
commita882f1a1d61c4406cc2968c325b7f6b06ef17b95 (patch)
tree76e8f3034781b5696bbad541f90bb91607787a3c /templates
parentebc0ad51ab319aefd88939963ecf172867b36f5a (diff)
parentac5e89a2fd94c4eb45e79e2c19b3ef5e9b240cb9 (diff)
downloadQt-a882f1a1d61c4406cc2968c325b7f6b06ef17b95.zip
Qt-a882f1a1d61c4406cc2968c325b7f6b06ef17b95.tar.gz
Qt-a882f1a1d61c4406cc2968c325b7f6b06ef17b95.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions