projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4323b1
73d37c2
)
Merge remote branch 'origin/master' into diabolik/umbraplayermodel
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 12 May 2010 19:42:18 +0000
(21:42 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 12 May 2010 19:42:18 +0000
(21:42 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff