summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/planets-qml/shaders
Commit message (Expand)AuthorAgeFilesLines
* Fixed planets-qml after 5.5.0 -> 5.5 mergeTomi Korpipää2015-06-2910-686/+2
* Merge remote-tracking branch 'origin/5.5.0' into 5.5Paul Lemire2015-06-2714-0/+1213
|\
| * Add ES2 support to planets-qml exampleMika Salmela2015-06-2314-0/+533
| * Planets QML example for Qt3DTomi Korpipää2015-06-238-0/+680
* Planets QML example for Qt3DTomi Korpipää2015-06-118-0/+680