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