From b5019e53d185d6891ff93a1549a6c6e66e88d2ed Mon Sep 17 00:00:00 2001
From: Lukas W <lukaswhl@gmail.com>
Date: Fri, 16 Jan 2015 00:04:09 +0100
Subject: [PATCH] Travis: Re-enable linux builds

---
 .travis.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8be09df37..390f7f0b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,10 @@
 language: cpp
 compiler: gcc
-os: osx
-#matrix:
-#    include:
-#        - env: TARGET_OS=win32
-#        - env: TARGET_OS=win64
-#        - os: osx
+matrix:
+    include:
+        - env: TARGET_OS=win32
+        - env: TARGET_OS=win64
+        - os: osx
 before_install:
     - sh ${TRAVIS_BUILD_DIR}/.travis/${TRAVIS_OS_NAME}.${TARGET_OS}.before_install.sh
 install: