Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)
2017-01-02 21:38:20 +01:00
parent db46a34418 2820b2d82b
commit 3f3f5a5359
287 changed files with 59481 additions and 17904 deletions
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@ -51,7 +51,7 @@

 class OS_Server : public OS_Unix {

-	Rasterizer *rasterizer;
+//	Rasterizer *rasterizer;
 	VisualServer *visual_server;
 	VideoMode current_videomode;
 	List<String> args;