projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
8f602cf
a04773f
)
Merge branch 'master' of /var/cache/git/xonotic/xonotic
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 29 Feb 2012 11:32:42 +0000
(12:32 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 29 Feb 2012 11:32:42 +0000
(12:32 +0100)
Trivial merge