]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 106fb44 9494670)
Merge remote-tracking branch 'origin/master' into samual/notifications
authorSamual Lenks <samual@xonotic.org>
Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 20 Apr 2013 20:29:54 +0000 (16:29 -0400)

Trivial merge