projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c0f6855
ff949c7
)
Merge remote-tracking branch 'origin/Mario/lms_fixes'
author
Samual Lenks <samual@xonotic.org>
Wed, 8 May 2013 04:31:10 +0000
(
00:31
-0400)
committer
Samual Lenks <samual@xonotic.org>
Wed, 8 May 2013 04:31:10 +0000
(
00:31
-0400)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff