projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
955bb97
c4d03be
)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
author
Rudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 15:30:55 +0000
(17:30 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 15:30:55 +0000
(17:30 +0200)
Trivial merge