]> 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 | compact (merge: 21dde28 c945b85)
Merge branch 'master' into mirceakitsune/per_character_sounds
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 4 May 2010 11:19:32 +0000 (14:19 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 4 May 2010 11:19:32 +0000 (14:19 +0300)

Trivial merge