]> 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: 3b929d7 64d58e3)
Merge remote-tracking branch 'origin/master' into Mario/radar_cvars
authorSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 18:14:53 +0000 (13:14 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 25 Feb 2013 18:14:53 +0000 (13:14 -0500)

Trivial merge