From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 5 Aug 2010 03:47:06 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~77
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=c21069392b64a9ccef84ef165bcda9f0627f6c25

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

c21069392b64a9ccef84ef165bcda9f0627f6c25
diff --cc all
index 8f34fdc9,6afd6dff..2f8a5382
--- a/all
+++ b/all
@@@ -117,9 -117,8 +117,9 @@@ data/xonotic-nexcompat.pk3dir 
  mediasource                   |                                                   | master      |
  darkplaces                    |                                                   | div0-stable | svn
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
- div0-gittools                 | git://git.icculus.org/divverent/div0-gittools.git | master      |
+ div0-gittools                 |                                                   | master      |
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable