From: ronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Date: Fri, 2 Sep 2011 14:29:01 +0000 (+0000)
Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... 
X-Git-Tag: 2.0.1~33
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=000645b1ecced3a77a4e2f4858c03e2fbb8bc95b

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1324 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d
---

diff --git a/shell/main.cpp b/shell/main.cpp
index 7abdb28f1..7fac0539d 100644
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -17,15 +17,16 @@
 *    along with CasparCG.  If not, see <http://www.gnu.org/licenses/>.
 *
 */
-#include "resource.h"
-
-#include "server.h"
 
 // tbbmalloc_proxy: 
 // Replace the standard memory allocation routines in Microsoft* C/C++ RTL 
 // (malloc/free, global new/delete, etc.) with the TBB memory allocator. 
 #include <tbb/tbbmalloc_proxy.h>
 
+#include "resource.h"
+
+#include "server.h"
+
 #ifdef _DEBUG
 	#define _CRTDBG_MAP_ALLOC
 	#include <stdlib.h>