From: Mario <zacjardine@y7mail.com>
Date: Sun, 27 Sep 2015 03:24:01 +0000 (+1000)
Subject: Merge branch 'master' into Mario/snake
X-Git-Tag: xonotic-v0.8.2~1906^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a16486e99c59c7d1dc2450c9bc9390276938af0b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/snake
---

a16486e99c59c7d1dc2450c9bc9390276938af0b
diff --cc qcsrc/common/minigames/minigame/all.qh
index 835081c4b,472c985a9..0bc61357b
--- a/qcsrc/common/minigames/minigame/all.qh
+++ b/qcsrc/common/minigames/minigame/all.qh
@@@ -65,10 -65,8 +65,9 @@@ that .owner is set to the minigame sess
  #include "ttt.qc"
  #include "c4.qc"
  #include "pong.qc"
- #include "qto.qc"
  #include "ps.qc"
  #include "pp.qc"
 +#include "snake.qc"
  
  /**
   * Registration:
@@@ -81,10 -79,8 +80,9 @@@
  	MINIGAME(ttt, "Tic Tac Toe") \
  	MINIGAME(pong,"Pong") \
  	MINIGAME(c4,  "Connect Four") \
- 	MINIGAME(qto, "Quinto") \
  	MINIGAME(ps,  "Peg Solitaire") \
  	MINIGAME(pp,  "Push-Pull") \
 +	MINIGAME(snake,"Snake") \
  	/*empty line*/
  
  /**