]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dda76f6 1898cf2)
Merge remote-tracking branch 'origin/samual/notification_rewrite'
authorSamual Lenks <samual@xonotic.org>
Tue, 5 Mar 2013 00:47:19 +0000 (19:47 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 5 Mar 2013 00:47:19 +0000 (19:47 -0500)

Trivial merge