projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7ed5fe5
c8d8b8a
)
Merge remote-tracking branch 'origin/samual/fix_welcome_message'
author
mand1nga <mand1nga@xonotic.org>
Thu, 1 Sep 2011 02:56:17 +0000
(23:56 -0300)
committer
mand1nga <mand1nga@xonotic.org>
Thu, 1 Sep 2011 02:56:17 +0000
(23:56 -0300)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff