summaryrefslogtreecommitdiff
path: root/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummycontextobject.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
* Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-22/+21
* QmlDesigner.Instances: Refactor the qml2 puppetMarco Bubke2012-09-241-0/+53