Merge branch 'master' into next
This commit is contained in:
commit
bca656e4ac
1 file changed
+1
-1
+1
-1
@@ -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
|
||||
|
||||
Reference in new issue
Block a user