Merge branch 'divVerent/simplified-sound-sliders'
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 23 Jun 2013 15:45:05 +0000 (17:45 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 23 Jun 2013 15:45:05 +0000 (17:45 +0200)
commitb1288ba426a18f2a8a7743139306b7f6ba3d5cbc
treecef76d81c9a8a9afab0babd9324c79a062b38a91
parentd956593da422ba1a23a26df20f87fe827593938c
parent2e9c3c7287aed3e5786cf25152ad3a04f10f35d9
Merge branch 'divVerent/simplified-sound-sliders'