]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 82461d0 fa7a05d)
Merge branch 'bones_was_here/mapinfoupdate' into 'master'
authorMirio <opivy@hotmail.de>
Fri, 17 Jan 2020 23:58:50 +0000 (23:58 +0000)
committerMirio <opivy@hotmail.de>
Fri, 17 Jan 2020 23:58:50 +0000 (23:58 +0000)
Remove blacklisted r_water clientsettemps and add gametype duel to appropriate maps

See merge request xonotic/xonotic-maps.pk3dir!142


Trivial merge