]> 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: d43d655 6eafd24)
Merge remote branch 'origin/fruitiex/gakarmor'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:16:05 +0000 (19:16 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:16:05 +0000 (19:16 +0200)

Trivial merge