From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 22 Jan 2013 22:59:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.0~149
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=e2962f03fe8fb0b1c47be56eca26761da97453a0;hp=22c2b8fb28b152664d5ad6fe7420e1e37904bf95

Merge remote-tracking branch 'origin/master'
---

diff --git a/gtest_sdl_main.cpp b/gtest_sdl_main.cpp
index 8a2fa9e..fa3a835 100644
--- a/gtest_sdl_main.cpp
+++ b/gtest_sdl_main.cpp
@@ -1,3 +1,5 @@
+#define GTEST_HAS_EXCEPTIONS 0
+
 #include <SDL/SDL.h>
 #include "gtest/gtest.h"