]> 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: 44f72c7 5ff2b40)
Merge remote-tracking branch 'origin/master' into samual/notifications
authorSamual Lenks <samual@xonotic.org>
Tue, 16 Apr 2013 00:47:37 +0000 (20:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 16 Apr 2013 00:47:37 +0000 (20:47 -0400)

Trivial merge