]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/samual/gameplay'
authorSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:11:09 +0000 (21:11 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 10 Jun 2013 01:11:09 +0000 (21:11 -0400)
commit72646dce0aa577090f682ed30c94509f9e3d8046
treeb321073f5e801b4cc45f7ff736c26bc8850cc72e
parentcfaacd5aff51c88ae76519d019aa6427ba1c5bc0
parent2fff44d40538b4294b5d828340ce6e4236d7355f
Merge remote-tracking branch 'origin/samual/gameplay'