Merge branch 'master' into divVerent/crypto2
[xonotic/xonotic.git] / misc / logos /
2010-06-13 Rudolf PolzerMerge remote branch 'refs/remotes/origin/merlijn/macosx...
2010-06-13 Rudolf Polzerrename "artwork" to "logo" to prevent future misuse...