projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
850b4c2
6579006
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
author
Rudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:31:04 +0000
(19:31 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:31:04 +0000
(19:31 +0200)
Trivial merge
projects / xonotic / xonotic.git / commitdiff