projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e7b12ef
d7a0101
)
Merge branch 'master' into MaidenBeast/translation_updates
author
MaidenBeast <fel.sallustio@gmail.com>
Sun, 31 Jul 2011 19:01:05 +0000
(21:01 +0200)
committer
MaidenBeast <fel.sallustio@gmail.com>
Sun, 31 Jul 2011 19:01:05 +0000
(21:01 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff