]> 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: 4a56e7b db9e033 2c0c917 7478ee6 e183a67)
Merge remote branches 'origin/diabolik/exteriorweaponposition', 'origin/diabolik...
authorRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 14:56:27 +0000 (16:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 25 May 2010 14:56:27 +0000 (16:56 +0200)

Trivial merge