]> 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: c14d904 75cedeb)
Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 13:50:11 +0000 (15:50 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 13:50:11 +0000 (15:50 +0200)

Trivial merge