projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78befc7
f7a7450
)
Merge remote branch 'origin/fruitiex/gamemode_freezetag'
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 29 Dec 2010 18:08:19 +0000
(19:08 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 29 Dec 2010 18:08:19 +0000
(19:08 +0100)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff