]> 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: 4f07f47 7dfb7cc)
Merge branch 'terencehill/keepaway_enhancements'
authorterencehill <piuntn@gmail.com>
Mon, 20 Aug 2018 19:19:15 +0000 (21:19 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 20 Aug 2018 19:19:15 +0000 (21:19 +0200)

Trivial merge