]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
projects / xonotic / xonotic-data.pk3dir.git / commit
summary | shortlog | log | commit | commitdiff | tree
(merge: a00da67 6551e48)
Merge branch 'bones_was_here/mv-r_water-acl' into 'master'
authorMario <mario.mario@y7mail.com>
Wed, 8 Jul 2020 15:37:16 +0000 (15:37 +0000)
committerMario <mario.mario@y7mail.com>
Wed, 8 Jul 2020 15:37:16 +0000 (15:37 +0000)
commitbe996f9b9d67ebbb153442b7e077253de6da798c
tree22158816786a22b486f7014eac68f88d9b758c44tree | snapshot
parenta00da67baa28814fe328ede2523e718c8e708844commit | diff
parent6551e487a054a2507c0bb48c2efc3e73713e1e9acommit | diff
Merge branch 'bones_was_here/mv-r_water-acl' into 'master'

Allow mappers to set r_water and server admins to add mapinfo ACLs

See merge request xonotic/xonotic-data.pk3dir!799
qcsrc/server/g_world.qc diff1 | diff2 | blob | history