]> 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: cc20342 be46fa6)
Merge branch 'master' into terencehill/ca_bots_fix
authorterencehill <piuntn@gmail.com>
Fri, 11 Nov 2016 18:14:55 +0000 (19:14 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 11 Nov 2016 18:14:55 +0000 (19:14 +0100)

Trivial merge