From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 12 Sep 2010 17:34:21 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~315
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ddc4a6d3d9e74c899fb9f850dc337343cbd5aab;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/crypto2

Conflicts:
	defaultXonotic.cfg
	quake.rc
---

9ddc4a6d3d9e74c899fb9f850dc337343cbd5aab
diff --cc quake.rc
index bb2ab366a,40228b079..1ae46d1d4
--- a/quake.rc
+++ b/quake.rc
@@@ -7,6 -8,3 +8,4 @@@ stuffcmd
  //startdemos demos/demo1 demos/demo2 demos/demo3
  //startdemos
  //play announcer/male/welcome.ogg
- 
- exec font-nimbussansl.cfg
 +crypto_keygen 0 http://rm.endoftheinternet.org/~xonotic/keygen/?ca=0&key=