aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/snippets/qml/imports/merged-named-imports.qml
Commit message (Expand)AuthorAgeFilesLines
* Fixed license headersJani Heikkinen2015-02-171-3/+3
* Update copyright headersJani Heikkinen2015-02-121-5/+5
* Doc: Expand example (importing multiple modules into 1 namespace)Sze Howe Koh2013-04-251-2/+9
* Doc: Replace some references to NokiaSze Howe Koh2013-04-241-2/+2
* Update copyright year in Digia's license headersSergio Ahumada2013-01-101-1/+1
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-231-6/+6
* Doc: Moving QML docs for new doc structureJerome Pasion2012-05-091-0/+47