]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into diabolik/umbraplayermodel
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 07:31:38 +0000 (09:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 07:31:38 +0000 (09:31 +0200)
commit140a4f6ce49232daabbb3b1f0310ffffac93b104
tree5f47994fa0f8aa42acb13c9e67b2a4ce0f40bd1c
parent5d9a9fcebaa31e0c1b91c080dda9c2070c883898
parent943e3fc6100d9108c5a5f8bae0e71e16f4e4227d
Merge branch 'master' into diabolik/umbraplayermodel