projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c717c93
2d71a1a
)
Merge remote-tracking branch 'origin/terencehill/misc_bugfixes'
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 19 Feb 2011 16:32:06 +0000
(17:32 +0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 19 Feb 2011 16:32:06 +0000
(17:32 +0100)
Trivial merge