Merge remote branch 'origin/master' into diabolik/techpanel
[xonotic/xonotic-maps.pk3dir.git] / textures / techpanelx / base /
drwxr-xr-x   ..
-rwxr-xr-x 1337109 base_diamondplate.png
-rwxr-xr-x 342718 base_diamondplate_norm.png