projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
26fb0a1
4bfcaf1
)
Merge branch 'master' into divVerent/crypto2
author
Rudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 09:11:02 +0000
(11:11 +0200)
committer
Rudolf Polzer <divVerent@alientrap.org>
Mon, 13 Sep 2010 09:11:02 +0000
(11:11 +0200)
Trivial merge