]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c5e8a5a c64484c)
Merge branch 'master' into cbrutail/function2012
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 15 Oct 2015 13:10:46 +0000 (09:10 -0400)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 15 Oct 2015 13:10:46 +0000 (09:10 -0400)

Trivial merge