]> 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: 3cdb031 d27a997)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Sat, 23 Feb 2013 23:35:04 +0000 (18:35 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 23 Feb 2013 23:35:04 +0000 (18:35 -0500)

Trivial merge