]> 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: 6643111 df3016a)
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)

Trivial merge