Rudolf Polzer 2003f97c2a Merge branch 'master' into divVerent/crypto2 ... Conflicts: all		2010-09-04 18:02:00 +02:00
..
MacOS	Merge branch 'master' into divVerent/crypto2	2010-09-04 18:02:00 +02:00
Resources	update Xonotic.icns	2010-09-04 16:47:42 +02:00
Info.plist	add some untested info.plist keys	2010-09-02 06:10:52 +02:00
PkgInfo	rebrand OSX buildfiles	2010-06-06 22:00:41 +02:00