]> 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: fec2951 7d99942)
Merge remote-tracking branch 'origin/master' into samual/makemulti_inverse
authorSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 18:34:55 +0000 (13:34 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 30 Dec 2013 18:34:55 +0000 (13:34 -0500)

Trivial merge