Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divverent@alientrap.org>
Thu, 26 Aug 2010 03:41:36 +0000 (05:41 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Aug 2010 03:41:36 +0000 (05:41 +0200)
1  2 
all

diff --cc all
--- 1/all
--- 2/all
+++ b/all
@@@ -113,13 -113,12 +113,13 @@@ repos_urls=
  data/xonotic-data.pk3dir      |                                                   | master      |
  data/xonotic-maps.pk3dir      |                                                   | master      |
  data/xonotic-music.pk3dir     |                                                   | master      |
- data/xonotic-nexcompat.pk3dir |                                                   | master      |
- mediasource                   |                                                   | master      |
+ data/xonotic-nexcompat.pk3dir |                                                   | master      | no
+ mediasource                   |                                                   | master      | no
  darkplaces                    |                                                   | div0-stable | svn
  fteqcc                        | git://github.com/Blub/qclib.git                   | master      |
- div0-gittools                 |                                                   | master      |
+ div0-gittools                 |                                                   | master      | no
  netradiant                    |                                                   | master      |
 +d0_blind_id                   | http://github.com/divVerent/d0_blind_id.git       | master      |
  "
  # todo: in darkplaces, change repobranch to div0-stable