Merge branch 'master' into output
[pspp] / src / ui / gui / pspplogo.png
src/ui/gui/pspplogo.png