projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
Allow mappers to set r_water and server admins to add mapinfo ACLs

See merge request xonotic/xonotic-data.pk3dir!799

1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_world.qc
Simple merge