]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim
authornifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 16:25:16 +0000 (12:25 -0400)
committernifrek <nifrek@gmail.com>
Wed, 15 Jun 2011 16:25:16 +0000 (12:25 -0400)
commit9b9ae97733ac4ecef8b5368bcceea13061df5608
tree60ebc510ab7d35966d7ec5be19465b27f0cdb580
parent248a331acb05ace0ac8f60b82751d30dd185f912
parentaab81d189275fc603179b1ad983ef53cf89a6b75
Merge remote-tracking branch 'origin/master' into nifrek/longjumpanim