]> 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: d956593 2e9c3c7)
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)

Trivial merge