projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c355a2
8d6d52a
)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
author
Rudolf Polzer <divverent@alientrap.org>
Sun, 21 Nov 2010 19:38:04 +0000
(20:38 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Sun, 21 Nov 2010 19:38:04 +0000
(20:38 +0100)
Trivial merge
projects / xonotic / xonotic.git / commitdiff