]> 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: af2e8ea 6afc533)
Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 18:14:16 +0000 (20:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 18:14:16 +0000 (20:14 +0200)

Trivial merge