]> 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: 24dfc68 cf1e9ff)
Merge remote-tracking branch 'origin/master' into samual/notifications
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 02:41:32 +0000 (22:41 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 02:41:32 +0000 (22:41 -0400)

Trivial merge