projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0a5f730
c5518de
)
Merge commit 'c5518de'
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:32 +0000
(
00:43
+0100)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 10 Dec 2010 23:43:32 +0000
(
00:43
+0100)
Trivial merge