diff options
| author | Stefan Suhren <suhren.stefan@fh-swf.de> | 2015-11-23 21:01:59 +0100 |
|---|---|---|
| committer | Stefan Suhren <suhren.stefan@fh-swf.de> | 2015-11-23 21:01:59 +0100 |
| commit | dddffcb89a3e53a6945698c0dcc769b4c3f8542b (patch) | |
| tree | d0c9863ca29ad5bc981ea867d2ef13594176e43c /qml/main.qml | |
| parent | 4db18dc608b6739c90b76166d2560fbd7013832c (diff) | |
| parent | 709e2363edcebdcf5d0185db77dc2944df7004dd (diff) | |
| download | Multimedia-dddffcb89a3e53a6945698c0dcc769b4c3f8542b.tar.gz Multimedia-dddffcb89a3e53a6945698c0dcc769b4c3f8542b.zip | |
Merge branch 'sphereTriangleStrip'
Discard the changes from master, as they were already ported.
Diffstat (limited to 'qml/main.qml')
0 files changed, 0 insertions, 0 deletions