Merge branch 'master' of warmcat.org:/home/git-repo/GameLab

# Conflicts:
#	Projects/VisualStudio/Editor/Editor.vcxproj
#	Projects/VisualStudio/Editor/Editor.vcxproj.filters

1 files changed, 0 insertions, 6 deletions

diff --git a/Runtime/main.cpp b/Runtime/main.cpp
deleted file mode 100644
index 8e8dba0..0000000
--- a/Runtime/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "SDL2/SDL.h"
-
-int main(int argn, char* args[])
-{
-	return 0;
-}