summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-01-04 01:17:41 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-01-04 01:17:41 -0300
commit76c2e8583e70e8c976a306e77a40e8e7226aa249 (patch)
treefe260ef3c0d00996d537f2fe3b8c78abfb92aa60 /.travis.yml
parentb085c40edfac45ec1c8b866c789f6e9bab7e5e08 (diff)
parent3a0c19d3f6ddb26359c95d84c376a8e6b1afd04d (diff)
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index ca110a3073..f95df46a2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ os:
- osx
env:
- - GODOT_TARGET=iphone
- - GODOT_TARGET=osx
+ #- GODOT_TARGET=iphone
+ #- GODOT_TARGET=osx
- GODOT_TARGET=x11
#- GODOT_TARGET=android
- GODOT_TARGET=windows