]> 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: 82a8176 183f0c1)
Merge branch 'master' into cbrutail/function2012 cbrutail/function2012
authorRudolf Polzer <rpolzer@google.com>
Wed, 19 Oct 2016 19:43:42 +0000 (15:43 -0400)
committerRudolf Polzer <rpolzer@google.com>
Wed, 19 Oct 2016 19:43:42 +0000 (15:43 -0400)

Trivial merge