]> de.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: cf1e9ff d598635)
Merge remote-tracking branch 'origin/samual/notifications'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 02:43:08 +0000 (22:43 -0400)

Trivial merge