]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/atheros/secret'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 27 Oct 2011 07:35:27 +0000 (09:35 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 27 Oct 2011 07:35:27 +0000 (09:35 +0200)
Conflicts:
qcsrc/server/progs.src

1  2 
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/progs.src

Simple merge
Simple merge
Simple merge
Simple merge
index b5307d42893dda6cbb1a8715ac92c6209a20c50e,a28405213cb90c2b7104431588448c8254f94e42..c29ac5ff965380bd8dde021b95856a8eef9a385d
@@@ -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