]> 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: fcce970 7f91e73)
Merge remote-tracking branch 'origin/master' into cbrutail/hudlaserminsta_fix
authorSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 9 May 2013 20:47:52 +0000 (16:47 -0400)

Trivial merge