From: Rudolf Polzer Date: Thu, 26 Aug 2010 03:41:36 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~62 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=2d39fadc6c846a4f9287f1c9e48fbf15629585b4 Merge branch 'master' into divVerent/crypto2 --- 2d39fadc6c846a4f9287f1c9e48fbf15629585b4 diff --cc all index 64a28e58,1296bdae..ba48d4ee --- a/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