]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80d1961 3dd6208)
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)

Trivial merge