projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
851b960
bd165c7
)
Merge branch 'master' into divVerent/crypto2
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 13:14:06 +0000
(15:14 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 15 Oct 2010 13:14:06 +0000
(15:14 +0200)
1
2
all
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
all
index
54452f8
,
c9d50d8
..
158d5df
---
1
/
all
---
2
/
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