From 30c394088d733ccf5b1a40787e15bb6b2dcd0164 Mon Sep 17 00:00:00 2001
From: Antony Woods <acron1@gmail.com>
Date: Wed, 30 Oct 2013 08:41:08 +0000
Subject: Normalize line endings

---
 scripts/travis.sh | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/travis.sh b/scripts/travis.sh
index 98d14a7..b6b7975 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -1,15 +1,15 @@
-#!/bin/bash -e
-
-CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1"
-
-if [ "$USE_STD_SHARED_PTR" = "1" ]; then
-  CMAKE_ARGS="${CMAKE_ARGS}"
-  # This fails on OSX
-  if [ "$CXX" = "clang++" ]; then
-    CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_CPP11_STDLIB=1"
-  fi
-fi
-
-cmake ${CMAKE_ARGS}
-make VERBOSE=1
-make test || cat Testing/Temporary/LastTest.log
+#!/bin/bash -e
+
+CMAKE_ARGS="-DCMAKE_BUILD_TYPE=Debug -DENTITYX_BUILD_TESTING=1"
+
+if [ "$USE_STD_SHARED_PTR" = "1" ]; then
+  CMAKE_ARGS="${CMAKE_ARGS}"
+  # This fails on OSX
+  if [ "$CXX" = "clang++" ]; then
+    CMAKE_ARGS="${CMAKE_ARGS} -DENTITYX_USE_CPP11_STDLIB=1"
+  fi
+fi
+
+cmake ${CMAKE_ARGS}
+make VERBOSE=1
+make test || cat Testing/Temporary/LastTest.log
-- 
cgit v1.2.3