projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5cc9692
e757d22
)
Merge remote branch 'refs/remotes/origin/esteel/finished/fixserver'
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 10:39:45 +0000
(12:39 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 18 Sep 2010 10:39:45 +0000
(12:39 +0200)
Trivial merge
projects / xonotic / xonotic.git / commitdiff