projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
20bc188
605ba4c
)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
author
Samual Lenks <samual@xonotic.org>
Fri, 28 Dec 2012 00:23:34 +0000
(19:23 -0500)
committer
Samual Lenks <samual@xonotic.org>
Fri, 28 Dec 2012 00:23:34 +0000
(19:23 -0500)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff