projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8e78fb4
977e573
)
Merge branch 'master' of ssh://git.xonotic.org/xonotic
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 06:37:15 +0000
(08:37 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 06:37:15 +0000
(08:37 +0200)
Trivial merge
projects / xonotic / xonotic.git / commitdiff