]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12f6661 56ed5bb)
Merge branch 'master' into divVerent/musicvolume
authorRudolf Polzer <divverent@xonotic.org>
Fri, 2 Aug 2013 10:32:06 +0000 (12:32 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 2 Aug 2013 10:32:06 +0000 (12:32 +0200)

Trivial merge