]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 14:08:47 +0000 (16:08 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 14:08:47 +0000 (16:08 +0200)
commit7b39a3868ca578191bc72e71873a5456517ebab6
tree6496ff5ecef7a7c908b75d257277faf77412760a
parent9c5a5dda59f0a56af85a1b5eaf58801323e7e123
parent07cf7fb3bfa35c5a2792fe36be6f1c22dcd7371c
Merge branch 'master' into mirceakitsune/per_character_sounds