From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 15 Oct 2010 13:14:06 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~17
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f196b4cd1269315260db8f80bc817dc67f5679ae

Merge branch 'master' into divVerent/crypto2
---

f196b4cd1269315260db8f80bc817dc67f5679ae
diff --cc all
index 54452f88,c9d50d86..158d5df1
--- a/all
+++ b/all
@@@ -116,10 -117,9 +117,10 @@@ data/xonotic-nexcompat.pk3dir 
  darkplaces                    |                                                   | div0-stable | svn
  netradiant                    |                                                   | master      |
  div0-gittools                 |                                                   | master      | no
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  data/xonotic-maps.pk3dir      |                                                   | master      |
  mediasource                   |                                                   | master      | no
- fteqcc                        | http://github.com/Blub/qclib.git                  | master      |
+ fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable