From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 27 Oct 2011 07:35:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/atheros/secret'
X-Git-Tag: xonotic-v0.6.0~35^2~78^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30cd3220d0370aa10dfb62eeb2ee3145d56b1c68;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/atheros/secret'

Conflicts:
	qcsrc/server/progs.src
---

30cd3220d0370aa10dfb62eeb2ee3145d56b1c68
diff --cc qcsrc/server/progs.src
index b5307d428,a28405213..c29ac5ff9
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -64,7 -64,7 +64,9 @@@ vote.q
  
  playerdemo.qh
  
++// singleplayer stuff
 +item_key.qh
+ secret.qh
  
  scores_rules.qc
  
@@@ -102,8 -102,9 +104,12 @@@ t_teleporters.q
  sv_main.qc
  
  g_triggers.qc
 -secret.qc
  g_models.qc
  
++// singleplayer stuff
++item_key.qc
++secret.qc
++
  cl_weaponsystem.qc
  w_common.qc