]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into divVerent/simplified-sound-sliders
authorSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:13:40 +0000 (02:13 -0400)
committerSamual Lenks <samual@xonotic.org>
Sat, 15 Jun 2013 06:13:40 +0000 (02:13 -0400)
commit032aa825a2db956597458450406f90eb273f1bf7
tree27252a2bdb4e5efd60085bf25d8bdffa78fdc23b
parent023a5399dcb4ce36cc54d28f721d3b17cef7762b
parentad4d291fdd6f2a81df64207dd9d8004faf272604
Merge remote-tracking branch 'origin/master' into divVerent/simplified-sound-sliders