projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4d9ffb9
d5ba9c6
)
Merge remote branch 'origin/tzork/turretfixes'
author
Rudolf Polzer <divVerent@xonotic.org>
Fri, 7 Jan 2011 14:45:40 +0000
(15:45 +0100)
committer
Rudolf Polzer <divVerent@xonotic.org>
Fri, 7 Jan 2011 14:45:40 +0000
(15:45 +0100)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff