]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'morphed/armor'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 26 Sep 2010 16:45:48 +0000 (18:45 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 26 Sep 2010 16:45:48 +0000 (18:45 +0200)
commitd1ef0e823b34950a422fc383b550db41c1de74d9
treebb0f145b5e222f4010200e0f9aa156c93e13dee6
parent80d19610b268119acc9d05430d4ccd3deabc072e
parent3dd6208daa5330aa2aab56ce6fea10c52507056b
Merge branch 'morphed/armor'