commit | dadc5dbcf7be248a256b073e2e7b91ea8805713d | [log] [tgz] |
---|---|---|
author | Jesse Barker <jesse.barker@linaro.org> | Mon Jul 09 08:54:30 2012 -0700 |
committer | Jesse Barker <jesse.barker@linaro.org> | Mon Jul 09 08:54:30 2012 -0700 |
tree | 5d297a465e7d94264e00cdafc18285f43a314ecf | |
parent | 9caf97aa688f709947a3e4d8b50392bed111786f [diff] | |
parent | 9380744f1bb746cbf6e72fa8f2655f6eb76060f1 [diff] |
Merge of lp:~glmark2-dev/glmark2/jellyfish. Adds new scene (SceneJellyfish) based upon Aleksandar Rodic's WebGL demo.