Merge branch 'gles'
[neverball] / data / shot-hard / ring.jpg
data/shot-hard/ring.jpg