]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/glowmod_color_fix
authorterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 18:30:41 +0000 (20:30 +0200)
committerterencehill <piuntn@gmail.com>
Mon, 8 Jun 2020 18:30:41 +0000 (20:30 +0200)
commit9ed0476492d5f4029cc36ac164d452591771ef8a
tree6cc51641fede367f22e124ada2eac7b81314fb7e
parent5adc9ca82afe8f5bb4bd1346a0cf9934622818ba
parente55c9da29216cc05fb0d201412dcd50dde2939e1
Merge branch 'master' into terencehill/glowmod_color_fix