]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/simplified-sound-sliders
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 12 Jun 2013 11:53:50 +0000 (13:53 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 12 Jun 2013 11:53:50 +0000 (13:53 +0200)
commitf7ee0cfda982d5fdc86bcdd686683db7cc699dc9
tree61aebfd5582056cfd2b69882547d34a33a1eed4b
parent664311178a4a786b2d7fa1b7a0eff68e8ae186fc
parentdf3016ae09ceb806fa1a87d1422f7ed0bfb98331
Merge branch 'master' into divVerent/simplified-sound-sliders