]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into diabolik/newanims
authorSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 19:43:28 +0000 (15:43 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Thu, 19 May 2011 19:43:28 +0000 (15:43 -0400)
commita877e74fef5f247800fbb78086dc51e802b722ba
treee67d3283c362b678f93583aabe24190c9af2d988
parentdcac695c2e9a7191b74672c3902b2acfc06b7bdd
parentc45bfd705e661594c1edbd1f8d57d2badb709e7a
Merge remote branch 'origin/master' into diabolik/newanims