Merge branch 'master' into win32

Conflicts:
	gui.h
	quadtree.cpp
	scene.cpp
	scene.h

1 files changed, 1 insertions, 1 deletions

diff --git a/video.cpp b/video.cpp
index ab9b9d3..29b5bcf 100644
--- a/video.cpp
+++ b/video.cpp
@@ -11,7 +11,7 @@ void video::init() {
 
 	surface = SDL_SetVideoMode(width, height, 32, SDL_OPENGL);
 
-	glClearColor(0, 0, 0, 0);
+	glClearColor(1, 1, 1, 0);
 	glClearDepth(1);
 	glDepthFunc(GL_LESS);
 	glEnable(GL_DEPTH_TEST);