]> 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: 136437d c7cfa6d)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Sun, 30 Sep 2012 22:44:39 +0000 (18:44 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 30 Sep 2012 22:44:39 +0000 (18:44 -0400)

Trivial merge