projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2038538
13a74ed
)
Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent...
author
Rudolf Polzer <divVerent@alientrap.org>
Tue, 7 Sep 2010 17:50:14 +0000
(19:50 +0200)
committer
Rudolf Polzer <divVerent@alientrap.org>
Tue, 7 Sep 2010 17:50:14 +0000
(19:50 +0200)
Trivial merge