projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
318039b
116d761
)
Merge remote branch 'origin/tzork/turrets'
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 16 Oct 2010 19:36:52 +0000
(21:36 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 16 Oct 2010 19:36:52 +0000
(21:36 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff