]> 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: 2943f92 515f7fa)
Merge remote-tracking branch 'origin/samual/notification_rewrite'
authorSamual Lenks <samual@xonotic.org>
Tue, 5 Mar 2013 00:31:37 +0000 (19:31 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 5 Mar 2013 00:31:37 +0000 (19:31 -0500)

Trivial merge