]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into diabolik/newanims
authorSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 23 May 2011 18:59:05 +0000 (14:59 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 23 May 2011 18:59:05 +0000 (14:59 -0400)
commitcdbf4d465dcd20a9ce7e1232671f24dc9d788459
tree64156e7a7a875b44f858c69d32d302868f7cd5bf
parenta877e74fef5f247800fbb78086dc51e802b722ba
parent46ce95f99de78e2ebddf0f87e1471167fa0de6fd
Merge remote branch 'origin/master' into diabolik/newanims
defaultXonotic.cfg