Merge branch 'master' into next

This commit is contained in:
James R 2020-08-29 18:22:19 -07:00
commit bca656e4ac

View file

@ -673,7 +673,7 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
/// Hardware renderer: OpenGL
#define GL_SHADERS
#ifdef HAVE_CURL
#if defined (HAVE_CURL) && ! defined (NONET)
#define MASTERSERVER
#else
#undef UPDATE_ALERT